From 9d40f6fc0055d21725878ceaddc0fd079cb8b732 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 20 Nov 2009 20:29:49 -0800
Subject: Paginator: don't try to set the position for "other" page types.

---
 modules/gallery/libraries/Theme_View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index b1167d0e..b64deab9 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -172,7 +172,7 @@ class Theme_View_Core extends Gallery_View {
 
       $v->first_visible_position = ($this->page - 1) * $this->page_size + 1;
       $v->last_visible_position = min($this->page * $this->page_size, $v->total);
-    } else {
+    } else if ($this->page_type == "item") {
       $v->position = $this->position;
       $v->total = $this->sibling_count;
       if ($this->previous_item) {
-- 
cgit v1.2.3


From b341b6b45db4a7d84d625594ee31dff6cfefb2b7 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 20 Nov 2009 20:30:12 -0800
Subject: The search results page is a "collection" page type.

---
 modules/search/controllers/search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index 539e063f..2f1aeb76 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -33,7 +33,7 @@ class Search_Controller extends Controller {
 
     $max_pages = max(ceil($count / $page_size), 1);
 
-    $template = new Theme_View("page.html", "other", "search");
+    $template = new Theme_View("page.html", "collection", "search");
     $template->set_global("page", $page);
     $template->set_global("max_pages", $max_pages);
     $template->set_global("page_size", $page_size);
-- 
cgit v1.2.3


From befb8244200ce365950a172c3d957d0043efd5d6 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 20 Nov 2009 21:16:59 -0800
Subject: Fixes #898

---
 modules/gallery/helpers/gallery_event.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 3139951f..02bfdf28 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -228,8 +228,8 @@ class gallery_event_Core {
                         ->label(t("Advanced"))
                         ->url(url::site("admin/advanced_settings")))
                ->append(Menu::factory("link")
-                        ->id("identity_drivers")
-                        ->label(t("Identity drivers"))
+                        ->id("authentication")
+                        ->label(t("Authentication"))
                         ->url(url::site("admin/identity"))))
       ->append(Menu::factory("link")
                ->id("modules")
-- 
cgit v1.2.3


From 4c5e2000f606d696a056fcfed231df5be8a42ada Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Fri, 20 Nov 2009 21:23:11 -0800
Subject: Don't call theme::get_info() on themes that don't have a theme.info. 
 Fixes #896.

---
 modules/gallery/controllers/admin_themes.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/gallery/controllers/admin_themes.php b/modules/gallery/controllers/admin_themes.php
index 23685c90..6991acd2 100644
--- a/modules/gallery/controllers/admin_themes.php
+++ b/modules/gallery/controllers/admin_themes.php
@@ -30,11 +30,13 @@ class Admin_Themes_Controller extends Admin_Controller {
   private function _get_themes() {
     $themes = array();
     foreach (scandir(THEMEPATH) as $theme_name) {
-      if ($theme_name[0] == ".") {
-        continue;
-      }
+      if (file_exists(THEMEPATH . "$theme_name/theme.info")) {
+        if ($theme_name[0] == ".") {
+          continue;
+        }
 
-      $themes[$theme_name] = theme::get_info($theme_name);
+        $themes[$theme_name] = theme::get_info($theme_name);
+      }
     }
     return $themes;
   }
-- 
cgit v1.2.3