From 5f86332db94966a635904e5f59cd00d1de9ccd13 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 27 Aug 2009 11:41:19 -0700
Subject: Convert tabs to spaces.

---
 modules/gallery/libraries/I18n.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules')

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.
 
-- 
cgit v1.2.3


From ddddfc5e8e505f83276acaa89057d5b9a9f6426f Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Thu, 27 Aug 2009 14:27:49 -0600
Subject: Make the info block display 'File name', instead of 'Folder name'
 when showing a photo. Fixes #631

---
 modules/info/views/info_block.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

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 ?>
-- 
cgit v1.2.3


From e586389f6573d4b4b817990064b61276d068b766 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 27 Aug 2009 13:29:39 -0700
Subject: Don't ask for csrf when we're resetting passwords.  They're not gonna
 have one.  Duh! Fixes #642.

---
 modules/user/controllers/password.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'modules')

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 {
-- 
cgit v1.2.3