From 24786872cdee97470016998ff170c99b00054167 Mon Sep 17 00:00:00 2001 From: cash Date: Tue, 6 Dec 2011 22:05:48 -0500 Subject: Fixes #4173 removed use of \w since it is locale sensitive --- engine/lib/output.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'engine/lib') diff --git a/engine/lib/output.php b/engine/lib/output.php index 60bcc72cd..989eca60e 100644 --- a/engine/lib/output.php +++ b/engine/lib/output.php @@ -306,6 +306,9 @@ function elgg_get_friendly_title($title) { } //$title = iconv('UTF-8', 'ASCII//TRANSLIT', $title); + + // use A-Za-z0-9_ instead of \w because \w is locale sensitive + $title = preg_replace("/[^A-Za-z0-9_ ]/", "", $title); $title = preg_replace("/[^\w ]/", "", $title); $title = str_replace(" ", "-", $title); $title = str_replace("--", "-", $title); -- cgit v1.2.3 From 7591e47ca63159e6324090bde7063ba53af8bfe6 Mon Sep 17 00:00:00 2001 From: Janek Lasocki-Biczysko Date: Tue, 6 Dec 2011 11:15:14 +0000 Subject: #4187 (get_entity optimization) --- engine/lib/entities.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'engine/lib') diff --git a/engine/lib/entities.php b/engine/lib/entities.php index dbb5ee695..daced6740 100644 --- a/engine/lib/entities.php +++ b/engine/lib/entities.php @@ -669,7 +669,10 @@ function get_entity($guid) { static $newentity_cache; $new_entity = false; - if (!is_numeric($guid)) { + // We could also use: if (!(int) $guid) { return FALSE }, + // but that evaluates to a false positive for $guid = TRUE. + // This is a bit slower, but more thorough. + if (!is_numeric($guid) || $guid === 0 || $guid === '0') { return FALSE; } -- cgit v1.2.3