From f6adcfe054a37afde734d672f9ad2f75c05c0df2 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 29 Dec 2009 11:36:52 -0800 Subject: Make sure that we have the mbstring extension. --- installer/installer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/installer/installer.php b/installer/installer.php index 3b1716e2..e2c60d46 100644 --- a/installer/installer.php +++ b/installer/installer.php @@ -210,7 +210,9 @@ class installer { $errors[] = "PHP is missing the SimpleXML extension"; } - if (extension_loaded("mbstring") && (ini_get("mbstring.func_overload") & MB_OVERLOAD_STRING)) { + if (!extension_loaded("mbstring")) { + $errors[] = "PHP is missing the mbstring extension"; + } else if (ini_get("mbstring.func_overload") & MB_OVERLOAD_STRING) { $errors[] = "The mbstring extension is overloading PHP's native string functions. Please disable it."; } -- cgit v1.2.3 From 41969cc9e454637f6e3a04b0e339942cbb140cf6 Mon Sep 17 00:00:00 2001 From: Tim Almdal Date: Tue, 29 Dec 2009 15:48:21 -0800 Subject: Another holdover from the K2.4 conversion. In R2.4 the url::current(true) was returning an empty string. This fixes ticket #955. --- modules/gallery/helpers/gallery_event.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php index 301432d4..0303c9cb 100644 --- a/modules/gallery/helpers/gallery_event.php +++ b/modules/gallery/helpers/gallery_event.php @@ -109,6 +109,7 @@ class gallery_event_Core { ->label(t("Login"))); } else { $csrf = access::csrf_token(); + $item = $theme->item(); $menu->append(Menu::factory("dialog") ->id("user_menu_edit_profile") ->css_id("g-user-profile-link") @@ -119,7 +120,7 @@ class gallery_event_Core { ->id("user_menu_logout") ->css_id("g-logout-link") ->url(url::site("logout?csrf=$csrf&continue=" . - urlencode(url::current(true)))) + urlencode($item->url()))) ->label(t("Logout"))); } } -- cgit v1.2.3