diff options
author | ArthurHoaro <arthur@hoa.ro> | 2016-12-20 11:06:22 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-01-03 09:47:15 +0100 |
commit | b3051a6aae446e063c3b6fa4a6a600357a9f24af (patch) | |
tree | befc1823dfc935fd827e6753b48f53d8150c3493 /application/Utils.php | |
parent | e0177549c760b143efdd17b1579e0c0199dce939 (diff) | |
download | Shaarli-b3051a6aae446e063c3b6fa4a6a600357a9f24af.tar.gz Shaarli-b3051a6aae446e063c3b6fa4a6a600357a9f24af.tar.zst Shaarli-b3051a6aae446e063c3b6fa4a6a600357a9f24af.zip |
Fixes presence of empty tags for private tags and in search results
* Private tags: make sure empty tags are properly filtered
* Search results:
* Use preg_split instead of function combination
* Add normalize_spaces to remove extra whitespaces displaying empty tags search
Diffstat (limited to 'application/Utils.php')
-rw-r--r-- | application/Utils.php | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/application/Utils.php b/application/Utils.php index 62902341..35d65224 100644 --- a/application/Utils.php +++ b/application/Utils.php | |||
@@ -257,3 +257,16 @@ function generate_api_secret($username, $salt) | |||
257 | 257 | ||
258 | return str_shuffle(substr(hash_hmac('sha512', uniqid($salt), $username), 10, 12)); | 258 | return str_shuffle(substr(hash_hmac('sha512', uniqid($salt), $username), 10, 12)); |
259 | } | 259 | } |
260 | |||
261 | /** | ||
262 | * Trim string, replace sequences of whitespaces by a single space. | ||
263 | * PHP equivalent to `normalize-space` XSLT function. | ||
264 | * | ||
265 | * @param string $string Input string. | ||
266 | * | ||
267 | * @return mixed Normalized string. | ||
268 | */ | ||
269 | function normalize_spaces($string) | ||
270 | { | ||
271 | return preg_replace('/\s{2,}/', ' ', trim($string)); | ||
272 | } | ||