diff options
| author | Starla Insigna <starla4444@gmail.com> | 2010-10-15 19:21:59 -0400 |
|---|---|---|
| committer | Starla Insigna <starla4444@gmail.com> | 2010-10-15 19:21:59 -0400 |
| commit | 05fef4cd88030e04f233b332a8e32057fb57d5e4 (patch) | |
| tree | acbba15de8db693961dbfe1c08a6611593e4497e /includes/parsers.php | |
| parent | 16e9aedc756003c2ab6fb6ee2d8842c5e7384aa7 (diff) | |
| download | fourisland-05fef4cd88030e04f233b332a8e32057fb57d5e4.tar.gz fourisland-05fef4cd88030e04f233b332a8e32057fb57d5e4.tar.bz2 fourisland-05fef4cd88030e04f233b332a8e32057fb57d5e4.zip | |
Backported [nosmilies] from Layout 8
Diffstat (limited to 'includes/parsers.php')
| -rwxr-xr-x | includes/parsers.php | 3 |
1 files changed, 2 insertions, 1 deletions
| diff --git a/includes/parsers.php b/includes/parsers.php index 86284af..a57561d 100755 --- a/includes/parsers.php +++ b/includes/parsers.php | |||
| @@ -28,8 +28,9 @@ include('includes/smilies.php'); | |||
| 28 | function parseText($text) | 28 | function parseText($text) |
| 29 | { | 29 | { |
| 30 | $text = htmlspecialchars($text); | 30 | $text = htmlspecialchars($text); |
| 31 | $text = parseSmiliesFirstPass($text); | ||
| 31 | $text = parseBBCode($text); | 32 | $text = parseBBCode($text); |
| 32 | $text = parseSmilies($text); | 33 | $text = parseSmiliesSecondPass($text); |
| 33 | $text = doAprilFoolsDay($text); | 34 | $text = doAprilFoolsDay($text); |
| 34 | 35 | ||
| 35 | return $text; | 36 | return $text; |