diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-08-03 15:37:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-08-03 15:37:01 +0200 |
| commit | 78623bf2ff3bf101d22abd839a743d9088968ff5 (patch) | |
| tree | 3cedfcb3738545de3ef5a4aeeff5690488ecb682 /phpBB/includes | |
| parent | 73040c6d1d7ad161f7ef316e4e6e096fe8e90d14 (diff) | |
| parent | 33eb9ad53aca850586abe8d896cd718181d480c0 (diff) | |
| download | forums-78623bf2ff3bf101d22abd839a743d9088968ff5.tar forums-78623bf2ff3bf101d22abd839a743d9088968ff5.tar.gz forums-78623bf2ff3bf101d22abd839a743d9088968ff5.tar.bz2 forums-78623bf2ff3bf101d22abd839a743d9088968ff5.tar.xz forums-78623bf2ff3bf101d22abd839a743d9088968ff5.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/11762] Added call to test class's parent::setUp().
[ticket/11762] Fixed test's filename
[ticket/11762] Use the === operator to distinguish "0" from ""
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_content.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index c54cc25f34..05d3c5fde2 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -413,7 +413,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags, $censor_text static $bbcode; global $phpbb_dispatcher; - if (!$text) + if ($text === '') { return ''; } @@ -505,7 +505,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb $uid = $bitfield = ''; $flags = (($allow_bbcode) ? OPTION_FLAG_BBCODE : 0) + (($allow_smilies) ? OPTION_FLAG_SMILIES : 0) + (($allow_urls) ? OPTION_FLAG_LINKS : 0); - if (!$text) + if ($text === '') { return; } |