diff options
| -rw-r--r-- | .htaccess | 5 | ||||
| -rw-r--r-- | modules/gallery/libraries/I18n.php | 8 | ||||
| -rw-r--r-- | modules/info/views/info_block.html.php | 2 | ||||
| -rw-r--r-- | modules/user/controllers/password.php | 2 |
4 files changed, 10 insertions, 7 deletions
@@ -44,6 +44,11 @@ # # Then just use your Gallery 3 without the index.php in the url. # +# NOTE: future upgrades of Gallery 3 will overwrite this file! If you +# want these changes to be persistent, you should talk to your system +# administrator about putting this block into your Apache config +# files. +# # <IfModule mod_rewrite.c> # RewriteEngine On # RewriteBase / diff --git a/modules/gallery/libraries/I18n.php b/modules/gallery/libraries/I18n.php index b1b4298a..d0531b9a 100644 --- a/modules/gallery/libraries/I18n.php +++ b/modules/gallery/libraries/I18n.php @@ -79,9 +79,9 @@ class I18n_Core { $locale_prefs[] = 'en_US'; $new_locale = setlocale(LC_ALL, $locale_prefs); if (is_string($new_locale) && strpos($new_locale, 'tr') === 0) { - // Make PHP 5 work with Turkish (the localization results are mixed though). - // Hack for http://bugs.php.net/18556 - setlocale(LC_CTYPE, 'C'); + // Make PHP 5 work with Turkish (the localization results are mixed though). + // Hack for http://bugs.php.net/18556 + setlocale(LC_CTYPE, 'C'); } } return $this->_config['default_locale']; @@ -183,7 +183,7 @@ class I18n_Core { static function is_plural_message($message) { return is_array($message); } - + private function interpolate($locale, $string, $values) { // TODO: Handle locale specific number formatting. diff --git a/modules/info/views/info_block.html.php b/modules/info/views/info_block.html.php index f86ae39d..762e989b 100644 --- a/modules/info/views/info_block.html.php +++ b/modules/info/views/info_block.html.php @@ -12,7 +12,7 @@ <? endif ?> <? if ($item->id != 1): ?> <li> - <strong class="caption"><?= t("Folder name:") ?></strong> + <strong class="caption"><?= $theme->page_type == 'album' ? t("Folder name:"): t("File name:"); ?></strong> <?= p::clean($item->name) ?> </li> <? endif ?> diff --git a/modules/user/controllers/password.php b/modules/user/controllers/password.php index 2af1b879..7c432701 100644 --- a/modules/user/controllers/password.php +++ b/modules/user/controllers/password.php @@ -29,8 +29,6 @@ class Password_Controller extends Controller { } public function do_reset() { - access::verify_csrf(); - if (request::method() == "post") { $this->_change_password(); } else { |