summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-07-17 18:35:06 -0700
committerBharat Mediratta <bharat@menalto.com>2009-07-17 18:35:06 -0700
commitdf22832a5b7e7c1962940becab1c90aaec3392f9 (patch)
tree1e76b7873ad53a0535f0ffe0ff35ed0c9ebf86af /modules/gallery/helpers
parentd692002bcfca1cc630ddd0e55b693744ef7fa924 (diff)
Rename "locale" helper to "locales" to avoid conflicting with PHP 5.3.
Fixes ticket #194
Diffstat (limited to 'modules/gallery/helpers')
-rw-r--r--modules/gallery/helpers/l10n_client.php2
-rw-r--r--modules/gallery/helpers/locales.php (renamed from modules/gallery/helpers/locale.php)2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/helpers/l10n_client.php b/modules/gallery/helpers/l10n_client.php
index 6d4da0eb..b576b4e1 100644
--- a/modules/gallery/helpers/l10n_client.php
+++ b/modules/gallery/helpers/l10n_client.php
@@ -74,7 +74,7 @@ class l10n_client_Core {
$request->locales = array();
$request->messages = new stdClass();
- $locales = locale::installed();
+ $locales = locales::installed();
foreach ($locales as $locale => $locale_data) {
$request->locales[] = $locale;
}
diff --git a/modules/gallery/helpers/locale.php b/modules/gallery/helpers/locales.php
index 41b78834..3762b97b 100644
--- a/modules/gallery/helpers/locale.php
+++ b/modules/gallery/helpers/locales.php
@@ -21,7 +21,7 @@
/**
* This is the API for handling locales.
*/
-class locale_Core {
+class locales_Core {
private static $locales;
/**