diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-04-13 21:15:14 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2014-04-13 21:15:14 +0200 |
| commit | face175471b5064117ca57ece53a3403e51e20ba (patch) | |
| tree | a0954756c4e4c1d56f96e9a0cb3ee52e5ae5a4ce /phpBB/includes/functions_content.php | |
| parent | 02378e94e779bbd407ef86166884c00e32d152fc (diff) | |
| download | forums-face175471b5064117ca57ece53a3403e51e20ba.tar forums-face175471b5064117ca57ece53a3403e51e20ba.tar.gz forums-face175471b5064117ca57ece53a3403e51e20ba.tar.bz2 forums-face175471b5064117ca57ece53a3403e51e20ba.tar.xz forums-face175471b5064117ca57ece53a3403e51e20ba.zip | |
[ticket/10423] Move code into a function and add tests for it
PHPBB3-10423
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 6213d2fd24..69a29dc31b 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -21,6 +21,7 @@ if (!defined('IN_PHPBB')) * make_jumpbox() * bump_topic_allowed() * get_context() +* phpbb_clean_search_string() * decode_message() * strip_bbcode() * generate_text_for_display() @@ -361,6 +362,23 @@ function get_context($text, $words, $length = 400) } /** +* Cleans a search string by removing single wildcards from it and replacing multiple spaces with a single one. +* +* @param string $search_string The full search string which should be cleaned. +* +* @return string The cleaned search string without any wildcards and multiple spaces. +*/ +function phpbb_clean_search_string($search_string) +{ + // This regular expressions matches every single wildcard. + // That means one after a whitespace or the beginning of the string or one before a whitespace or the end of the string. + $search_string = preg_replace('#(?<=^|\s)\*(?=\s|$)#', '', $search_string); + $search_string = trim($search_string); + $search_string = preg_replace('#\s+#u', ' ', $search_string); + return $search_string; +} + +/** * Decode text whereby text is coming from the db and expected to be pre-parsed content * We are placing this outside of the message parser because we are often in need of it... */ |