From b42fcb9cda4dafdb9db86770f54965b3fb2fc7ab Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 28 Dec 2010 23:10:05 -0800
Subject: Use db::expr instead of "new Database_Expression".  Resolves #1560.

---
 modules/gallery/libraries/ORM_MPTT.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/ORM_MPTT.php b/modules/gallery/libraries/ORM_MPTT.php
index f20fafa0..4556273c 100644
--- a/modules/gallery/libraries/ORM_MPTT.php
+++ b/modules/gallery/libraries/ORM_MPTT.php
@@ -54,12 +54,12 @@ class ORM_MPTT_Core extends ORM {
         // Make a hole in the parent for this new item
         db::build()
           ->update($this->table_name)
-          ->set("left_ptr", new Database_Expression("`left_ptr` + 2"))
+          ->set("left_ptr", db::expr("`left_ptr` + 2"))
           ->where("left_ptr", ">=", $parent->right_ptr)
           ->execute();
         db::build()
           ->update($this->table_name)
-          ->set("right_ptr", new Database_Expression("`right_ptr` + 2"))
+          ->set("right_ptr", db::expr("`right_ptr` + 2"))
           ->where("right_ptr", ">=", $parent->right_ptr)
           ->execute();
         $parent->right_ptr += 2;
@@ -109,12 +109,12 @@ class ORM_MPTT_Core extends ORM {
     try {
       db::build()
         ->update($this->table_name)
-        ->set("left_ptr", new Database_Expression("`left_ptr` - 2"))
+        ->set("left_ptr", db::expr("`left_ptr` - 2"))
         ->where("left_ptr", ">", $this->right_ptr)
         ->execute();
       db::build()
         ->update($this->table_name)
-        ->set("right_ptr", new Database_Expression("`right_ptr` - 2"))
+        ->set("right_ptr", db::expr("`right_ptr` - 2"))
         ->where("right_ptr", ">", $this->right_ptr)
         ->execute();
     } catch (Exception $e) {
@@ -253,7 +253,7 @@ class ORM_MPTT_Core extends ORM {
         // Update the levels for the to-be-moved items
         db::build()
           ->update($this->table_name)
-          ->set("level", new Database_Expression("`level` + $level_delta"))
+          ->set("level", db::expr("`level` + $level_delta"))
           ->where("left_ptr", ">=", $original_left_ptr)
           ->where("right_ptr", "<=", $original_right_ptr)
           ->execute();
@@ -262,12 +262,12 @@ class ORM_MPTT_Core extends ORM {
       // Make a hole in the target for the move
       db::build()
         ->update($this->table_name)
-        ->set("left_ptr", new Database_Expression("`left_ptr` + $size_of_hole"))
+        ->set("left_ptr", db::expr("`left_ptr` + $size_of_hole"))
         ->where("left_ptr", ">=", $target_right_ptr)
         ->execute();
       db::build()
         ->update($this->table_name)
-        ->set("right_ptr", new Database_Expression("`right_ptr` + $size_of_hole"))
+        ->set("right_ptr", db::expr("`right_ptr` + $size_of_hole"))
         ->where("right_ptr", ">=", $target_right_ptr)
         ->execute();
 
@@ -290,8 +290,8 @@ class ORM_MPTT_Core extends ORM {
       $new_offset = $target->right_ptr - $left_ptr;
       db::build()
         ->update($this->table_name)
-        ->set("left_ptr", new Database_Expression("`left_ptr` + $new_offset"))
-        ->set("right_ptr", new Database_Expression("`right_ptr` + $new_offset"))
+        ->set("left_ptr", db::expr("`left_ptr` + $new_offset"))
+        ->set("right_ptr", db::expr("`right_ptr` + $new_offset"))
         ->where("left_ptr", ">=", $left_ptr)
         ->where("right_ptr", "<=", $right_ptr)
         ->execute();
@@ -299,12 +299,12 @@ class ORM_MPTT_Core extends ORM {
       // Close the hole in the source's parent after the move
       db::build()
         ->update($this->table_name)
-        ->set("left_ptr", new Database_Expression("`left_ptr` - $size_of_hole"))
+        ->set("left_ptr", db::expr("`left_ptr` - $size_of_hole"))
         ->where("left_ptr", ">", $right_ptr)
         ->execute();
       db::build()
         ->update($this->table_name)
-        ->set("right_ptr", new Database_Expression("`right_ptr` - $size_of_hole"))
+        ->set("right_ptr", db::expr("`right_ptr` - $size_of_hole"))
         ->where("right_ptr", ">", $right_ptr)
         ->execute();
     } catch (Exception $e) {
-- 
cgit v1.2.3


From fda92507964b9521b632a97c9e343b4639a657f7 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Mon, 27 Dec 2010 14:03:11 +0100
Subject: Added limit on select as for the outcome it doesn't matter if there
 are 20 rows or just 1. Is sufficient to return straight after reading 1 row.

---
 modules/gallery/libraries/drivers/Cache/Database.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index b7822811..4f57b3da 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -34,6 +34,7 @@ class Cache_Database_Driver extends Cache_Driver {
     $count = db::build()
       ->where("key", "=", $id)
       ->where("expiration", ">=", time())
+      ->limit("1")
       ->count_records("caches");
     return $count > 0;
   }
-- 
cgit v1.2.3


From 66fd8c7518ab71466aca72d20fb7bcd5f374af26 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Mon, 27 Dec 2010 15:35:33 +0100
Subject: Using ON DUPLICATE KEY UPDATE instead of SELECT+UPDATE/INSERT style
 method (that does 2 trips to Database server and is less optimal). exists()
 method is not needed anymore thus got removed

---
 .../gallery/libraries/drivers/Cache/Database.php   | 38 +++++-----------------
 1 file changed, 8 insertions(+), 30 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index 4f57b3da..7eda5b30 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -24,21 +24,6 @@ class Cache_Database_Driver extends Cache_Driver {
   // Kohana database instance
   protected $db;
 
-  /**
-   * Checks if a cache id is already set.
-   *
-   * @param  string   cache id
-   * @return boolean
-   */
-  public function exists($id) {
-    $count = db::build()
-      ->where("key", "=", $id)
-      ->where("expiration", ">=", time())
-      ->limit("1")
-      ->count_records("caches");
-    return $count > 0;
-  }
-
   /**
    * Sets a cache item to the given data, tags, and lifetime.
    *
@@ -60,22 +45,15 @@ class Cache_Database_Driver extends Cache_Driver {
       $lifetime += time();
     }
 
+	$db = Database::instance();
+    $tags = $db->escape($tags);
     foreach ($items as $id => $data) {
-      if ($this->exists($id)) {
-        $status = db::build()
-          ->update("caches")
-          ->set("tags", $tags)
-          ->set("expiration", $lifetime)
-          ->set("cache", serialize($data))
-          ->where("key", "=", $id)
-          ->execute();
-      } else {
-        $status = db::build()
-          ->insert("caches")
-          ->columns("key", "tags", "expiration", "cache")
-          ->values($id, $tags, $lifetime, serialize($data))
-          ->execute();
-      }
+      $id = $db->escape($id);
+      $data = $db->escape(serialize($data));
+      $db->query("INSERT INTO {caches} (`key`, `tags`, `expiration`, `cache`) 
+                  VALUES ('$id', '$tags', $lifetime, '$data') 
+                  ON DUPLICATE KEY UPDATE 
+                   `tags`=VALUES(tags), `expiration`=VALUES(expiration), `cache`=VALUES(cache)");
     }
 
     return true;
-- 
cgit v1.2.3


From 17700b805fad7a74e871366159b4fe1ae4c2d883 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Tue, 28 Dec 2010 22:28:55 +0100
Subject: Coding style fixes: identation on line 48+removed trailing
 whitespaces, added spaces around =s

---
 modules/gallery/libraries/drivers/Cache/Database.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/drivers/Cache/Database.php b/modules/gallery/libraries/drivers/Cache/Database.php
index 7eda5b30..2e773ca4 100644
--- a/modules/gallery/libraries/drivers/Cache/Database.php
+++ b/modules/gallery/libraries/drivers/Cache/Database.php
@@ -45,15 +45,15 @@ class Cache_Database_Driver extends Cache_Driver {
       $lifetime += time();
     }
 
-	$db = Database::instance();
+    $db = Database::instance();
     $tags = $db->escape($tags);
     foreach ($items as $id => $data) {
       $id = $db->escape($id);
       $data = $db->escape(serialize($data));
-      $db->query("INSERT INTO {caches} (`key`, `tags`, `expiration`, `cache`) 
-                  VALUES ('$id', '$tags', $lifetime, '$data') 
-                  ON DUPLICATE KEY UPDATE 
-                   `tags`=VALUES(tags), `expiration`=VALUES(expiration), `cache`=VALUES(cache)");
+      $db->query("INSERT INTO {caches} (`key`, `tags`, `expiration`, `cache`)
+                  VALUES ('$id', '$tags', $lifetime, '$data')
+                  ON DUPLICATE KEY UPDATE `tags` = VALUES(tags), `expiration` = VALUES(expiration),
+                  `cache` = VALUES(cache)");
     }
 
     return true;
-- 
cgit v1.2.3


From a8b0254e4a64b46bef303fbf2dafc4d9553ae38f Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 29 Dec 2010 17:31:28 -0800
Subject: Improve the solution for #1545 by sorting the settings menu properly
 to be naturally ordered and case insensitive.

---
 modules/gallery/helpers/gallery_event.php | 2 +-
 modules/gallery/libraries/Admin_View.php  | 2 +-
 modules/gallery/libraries/Menu.php        | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 5d3ee6ee..689e21d1 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -377,7 +377,7 @@ class gallery_event_Core {
         module::event("admin_menu", $admin_menu, $theme);
 
         $settings_menu = $admin_menu->get("settings_menu");
-        sort($settings_menu->elements);
+        uasort($settings_menu->elements, array("Menu", "title_comparator"));
       }
     }
   }
diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 11f8ad14..bff13ace 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -46,7 +46,7 @@ class Admin_View_Core extends Gallery_View {
     module::event("admin_menu", $menu, $this);
 
     $settings_menu = $menu->get("settings_menu");
-    sort($settings_menu->elements);
+    uasort($settings_menu->elements, array("Menu", "title_comparator"));
 
     return $menu->render();
   }
diff --git a/modules/gallery/libraries/Menu.php b/modules/gallery/libraries/Menu.php
index 58852a72..78b60196 100644
--- a/modules/gallery/libraries/Menu.php
+++ b/modules/gallery/libraries/Menu.php
@@ -250,4 +250,8 @@ class Menu_Core extends Menu_Element {
     $view->menu = $this;
     return $view;
   }
+
+  static function title_comparator($a, $b) {
+    return strnatcasecmp((string)$a->label, (string)$b->label);
+  }
 }
-- 
cgit v1.2.3


From cfaa62370ecbdb3badf4ab68bbefa7cfedaea154 Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Sun, 2 Jan 2011 18:59:23 +0100
Subject: Reimplemented Kohana 2.3's View::set_global() with array support.
 Allows for cleaner code and fewer function calls.

---
 modules/gallery/controllers/albums.php | 17 +++++++++--------
 modules/gallery/controllers/movies.php | 17 +++++++++--------
 modules/gallery/controllers/photos.php | 17 +++++++++--------
 modules/gallery/libraries/MY_View.php  | 10 ++++++++--
 4 files changed, 35 insertions(+), 26 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index c0368488..e69f6b6d 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -61,14 +61,15 @@ class Albums_Controller extends Items_Controller {
     }
 
     $template = new Theme_View("page.html", "collection", "album");
-    $template->set_global("page", $page);
-    $template->set_global("page_title", null);
-    $template->set_global("max_pages", $max_pages);
-    $template->set_global("page_size", $page_size);
-    $template->set_global("item", $album);
-    $template->set_global("children", $album->viewable()->children($page_size, $offset));
-    $template->set_global("children_count", $children_count);
-    $template->set_global("parents", $album->parents()->as_array()); // view calls empty() on this
+    $template->set_global(array("page" => $page,
+                                "page_title" => null,
+                                "max_pages" => $max_pages,
+                                "page_size" => $page_size,
+                                "item" => $album,
+                                "children" => $album->viewable()->children($page_size, $offset),
+                                "children_count" => $children_count,
+                                "parents" => $album->parents()->as_array()));
+                                  // view calls empty() on this
     $template->content = new View("album.html");
 
     $album->increment_view_count();
diff --git a/modules/gallery/controllers/movies.php b/modules/gallery/controllers/movies.php
index 15d4f950..1ae969c7 100644
--- a/modules/gallery/controllers/movies.php
+++ b/modules/gallery/controllers/movies.php
@@ -38,14 +38,15 @@ class Movies_Controller extends Items_Controller {
     }
 
     $template = new Theme_View("page.html", "item", "movie");
-    $template->set_global("item", $movie);
-    $template->set_global("children", array());
-    $template->set_global("children_count", 0);
-    $template->set_global("parents", $movie->parents()->as_array());
-    $template->set_global("next_item", $next_item);
-    $template->set_global("previous_item", $previous_item);
-    $template->set_global("sibling_count", $movie->parent()->viewable()->children_count($where));
-    $template->set_global("position", $position);
+    $template->set_global(array("item" => $movie,
+                                "children" => array(),
+                                "children_count" => 0,
+                                "parents" => $movie->parents()->as_array(),
+                                "next_item" => $next_item,
+                                "previous_item" => $previous_item,
+                                "sibling_count"
+                                  => $movie->parent()->viewable()->children_count($where),
+                                "position" => $position));
 
     $template->content = new View("movie.html");
 
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 2dc22ca4..e795f336 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -38,14 +38,15 @@ class Photos_Controller extends Items_Controller {
     }
 
     $template = new Theme_View("page.html", "item", "photo");
-    $template->set_global("item", $photo);
-    $template->set_global("children", array());
-    $template->set_global("children_count", 0);
-    $template->set_global("parents", $photo->parents()->as_array());
-    $template->set_global("next_item", $next_item);
-    $template->set_global("previous_item", $previous_item);
-    $template->set_global("sibling_count", $photo->parent()->viewable()->children_count($where));
-    $template->set_global("position", $position);
+    $template->set_global(array("item" => $photo,
+                                "children" => array(),
+                                "children_count" => 0,
+                                "parents" => $photo->parents()->as_array(),
+                                "next_item" => $next_item,
+                                "previous_item" => $previous_item,
+                                "sibling_count"
+                                  => $photo->parent()->viewable()->children_count($where),
+                                "position" => $position));
 
     $template->content = new View("photo.html");
 
diff --git a/modules/gallery/libraries/MY_View.php b/modules/gallery/libraries/MY_View.php
index ded77792..2230203a 100644
--- a/modules/gallery/libraries/MY_View.php
+++ b/modules/gallery/libraries/MY_View.php
@@ -23,8 +23,14 @@ class View extends View_Core {
   /**
    * Reimplement Kohana 2.3's View::set_global() functionality.
    */
-  public function set_global($key, $value) {
-    View::$global_data[$key] = $value;
+  public function set_global($key, $value = NULL) {
+    if (is_array($key)) {
+      foreach ($key as $key2 => $value) {
+        View::$global_data[$key2] = $value;
+      }
+    } else {
+      View::$global_data[$key] = $value;
+    }
   }
 
   public function is_set($key=null) {
-- 
cgit v1.2.3


From f364e8a96b47f0e4f674c8b36317fc80184b219a Mon Sep 17 00:00:00 2001
From: Joe7 <jozsef.rnagy@site.hu>
Date: Mon, 3 Jan 2011 20:28:54 +0100
Subject: Using array support introduced in
 8295201adf948ea35f21f75801b7a8bf36c27569

---
 modules/gallery/libraries/Admin_View.php | 10 +++++-----
 modules/gallery/libraries/Theme_View.php | 10 +++++-----
 modules/search/controllers/search.php    |  8 ++++----
 modules/tag/controllers/tag.php          | 12 ++++++------
 4 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index bff13ace..28a003cc 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -34,11 +34,11 @@ class Admin_View_Core extends Gallery_View {
       $this->theme_name = Input::instance()->get("theme", $this->theme_name);
     }
     $this->sidebar = "";
-    $this->set_global("theme", $this);
-    $this->set_global("user", identity::active_user());
-    $this->set_global("page_type", "admin");
-    $this->set_global("page_subtype", $name);
-    $this->set_global("page_title", null);
+    $this->set_global(array("theme" => $this,
+                            "user" => identity::active_user(),
+                            "page_type" => "admin",
+                            "page_subtype" => $name,
+                            "page_title" => null));
   }
 
   public function admin_menu() {
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index d22bb03a..ba1862c0 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -37,11 +37,11 @@ class Theme_View_Core extends Gallery_View {
     }
     $this->item = null;
     $this->tag = null;
-    $this->set_global("theme", $this);
-    $this->set_global("user", identity::active_user());
-    $this->set_global("page_type", $page_type);
-    $this->set_global("page_subtype", $page_subtype);
-    $this->set_global("page_title", null);
+    $this->set_global(array("theme" => $this,
+                            "user" => identity::active_user(),
+                            "page_type" => $page_type,
+                            "page_subtype" => $page_subtype,
+                            "page_title" => null));
     if ($page_type == "collection") {
       $this->set_global("thumb_proportion", $this->thumb_proportion());
     }
diff --git a/modules/search/controllers/search.php b/modules/search/controllers/search.php
index e5894f30..733bc9f7 100644
--- a/modules/search/controllers/search.php
+++ b/modules/search/controllers/search.php
@@ -34,10 +34,10 @@ class Search_Controller extends Controller {
     $max_pages = max(ceil($count / $page_size), 1);
 
     $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);
-    $template->set_global("children_count", $count);
+    $template->set_global(array("page" => $page,
+                                "max_pages" => $max_pages,
+                                "page_size" => $page_size,
+                                "children_count" => $count));
 
     $template->content = new View("search.html");
     $template->content->items = $result;
diff --git a/modules/tag/controllers/tag.php b/modules/tag/controllers/tag.php
index 0e924f3d..7bfa7d58 100644
--- a/modules/tag/controllers/tag.php
+++ b/modules/tag/controllers/tag.php
@@ -35,12 +35,12 @@ class Tag_Controller extends Controller {
     }
 
     $template = new Theme_View("page.html", "collection", "tag");
-    $template->set_global("page", $page);
-    $template->set_global("max_pages", $max_pages);
-    $template->set_global("page_size", $page_size);
-    $template->set_global("tag", $tag);
-    $template->set_global("children", $tag->items($page_size, $offset));
-    $template->set_global("children_count", $children_count);
+    $template->set_global(array("page" => $page,
+                                "max_pages" => $max_pages,
+                                "page_size" => $page_size,
+                                "tag" => $tag,
+                                "children" => $tag->items($page_size, $offset),
+                                "children_count" => $children_count));
     $template->content = new View("dynamic.html");
     $template->content->title = t("Tag: %tag_name", array("tag_name" => $tag->name));
 
-- 
cgit v1.2.3


From 5ac49d497f51a3828c1254b5024a4aa898f86530 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 10 Jan 2011 22:20:12 -0800
Subject: Create new APIs for allowing themers to control what CSS/JS get
 combined and when.  Backwards compatible in that old themes will work, but
 their CSS/JS will no longer be combined unless they make some changes.  Fixes
 #1600.

---
 modules/gallery/libraries/Admin_View.php   |  5 ---
 modules/gallery/libraries/Gallery_View.php | 61 +++++++++++++++++++++---------
 modules/gallery/libraries/Theme_View.php   | 14 -------
 themes/admin_wind/views/admin.html.php     | 38 ++++++++++++-------
 themes/wind/views/page.html.php            | 49 +++++++++++++++---------
 5 files changed, 99 insertions(+), 68 deletions(-)

(limited to 'modules/gallery/libraries')

diff --git a/modules/gallery/libraries/Admin_View.php b/modules/gallery/libraries/Admin_View.php
index 28a003cc..1a633a34 100644
--- a/modules/gallery/libraries/Admin_View.php
+++ b/modules/gallery/libraries/Admin_View.php
@@ -96,11 +96,6 @@ class Admin_View_Core extends Gallery_View {
         }
       }
 
-      if ($function == "admin_head") {
-        array_unshift($blocks, $this->combine_files($this->scripts, "javascript"));
-        array_unshift($blocks, $this->combine_files($this->css, "css"));
-      }
-
       if (Session::instance()->get("debug")) {
         if ($function != "admin_head") {
           array_unshift(
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index b45bb94a..8befda95 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -19,18 +19,35 @@
  */
 class Gallery_View_Core extends View {
   protected $theme_name = null;
-  protected $scripts = array();
-  protected $css = array();
+  protected $combine_queue = array();
 
   /**
-   * Add a script to the combined scripts list.
+   * Begin gather up scripts or css files so that they can be combined into a single request.
+   *
+   * @param $types  a comma separated list of types to combine, eg "script,css"
+   */
+  public function start_combining($types) {
+    foreach (explode(",", $types) as $type) {
+      $this->combine_queue[$type] = array();
+    }
+  }
+
+  /**
+   * If script combining is enabled, add this script to the list of scripts that will be
+   * combined into a single script element.  When combined, the order of scripts is preserved.
+   *
    * @param $file  the file name or path of the script to include. If a path is specified then
    *               it needs to be relative to DOCROOT. Just specifying a file name will result
    *               in searching Kohana's cascading file system.
+   * @param $group the group of scripts to combine this with.  defaults to "core"
    */
-  public function script($file) {
+  public function script($file, $group="core") {
     if (($path = gallery::find_file("js", $file, false))) {
-      $this->scripts[$path] = 1;
+      if (isset($this->combine_queue["script"])) {
+        $this->combine_queue["script"][$group][$path] = 1;
+      } else {
+        return html::script($path);
+      }
     } else {
       Kohana_Log::add("error", "Can't find script file: $file");
     }
@@ -46,14 +63,22 @@ class Gallery_View_Core extends View {
   }
 
   /**
-   * Add a css file to the combined css list.
-   * @param $file  the file name or path of the script to include. If a path is specified then
+   * If css combining is enabled, add this css to the list of css that will be
+   * combined into a single style element.  When combined, the order of style elements
+   * is preserved.
+   *
+   * @param $file  the file name or path of the css to include. If a path is specified then
    *               it needs to be relative to DOCROOT. Just specifying a file name will result
    *               in searching Kohana's cascading file system.
+   * @param $group the group of css to combine this with.  defaults to "core"
    */
-  public function css($file) {
+  public function css($file, $group="core") {
     if (($path = gallery::find_file("css", $file, false))) {
-      $this->css[$path] = 1;
+      if (isset($this->combine_queue["css"])) {
+        $this->combine_queue["css"][$group][$path] = 1;
+      } else {
+        return html::stylesheet($path);
+      }
     } else {
       Kohana_Log::add("error", "Can't find css file: $file");
     }
@@ -61,11 +86,13 @@ class Gallery_View_Core extends View {
 
   /**
    * Combine a series of files into a single one and cache it in the database.
+   * @param $type  the data type (script or css)
+   * @param $group the group of scripts or css we want
    */
-  protected function combine_files($paths, $type) {
+  public function get_combined($type, $group="core") {
     $links = array();
 
-    if (empty($paths)) {
+    if (empty($this->combine_queue[$type][$group])) {
       return;
     }
 
@@ -73,7 +100,7 @@ class Gallery_View_Core extends View {
     // entries.
     $key = array(url::abs_file(""));
 
-    foreach (array_keys($paths) as $path) {
+    foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
       $stats = stat($path);
       // 7 == size, 9 == mtime, see http://php.net/stat
       $key[] = "$path $stats[7] $stats[9]";
@@ -85,7 +112,7 @@ class Gallery_View_Core extends View {
 
     if (empty($contents)) {
       $contents = "";
-      foreach (array_keys($paths) as $path) {
+      foreach (array_keys($this->combine_queue[$type][$group]) as $path) {
         if ($type == "css") {
           $contents .= "/* $path */\n" . $this->process_css($path) . "\n";
         } else {
@@ -103,12 +130,12 @@ class Gallery_View_Core extends View {
       }
     }
 
+    unset($this->combine_queue[$type][$group]);
+
     if ($type == "css") {
-      return "<!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->\n" .
-        html::stylesheet("combined/css/$key", "screen,print,projection", true);
+      return html::stylesheet("combined/css/$key", "screen,print,projection", true);
     } else {
-      return "<!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->\n" .
-        html::script("combined/javascript/$key", true);
+      return html::script("combined/javascript/$key", true);
     }
   }
 
diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index ba1862c0..04784ca1 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -236,13 +236,6 @@ class Theme_View_Core extends Gallery_View {
     case "thumb_bottom":
     case "thumb_info":
     case "thumb_top":
-      if ($function == "head") {
-        // Stash any CSS we have already; that came from the theme and we want theme CSS to
-        // override module CSs
-        $save_css = $this->css;
-        $this->css = array();
-      }
-
       $blocks = array();
       if (method_exists("gallery_theme", $function)) {
         switch (count($args)) {
@@ -281,13 +274,6 @@ class Theme_View_Core extends Gallery_View {
           array_merge(array($this), $args));
       }
 
-      if ($function == "head") {
-        // Merge the theme CSS/JS at the end
-        $this->css = array_merge($this->css, $save_css);
-        array_unshift($blocks, $this->combine_files($this->scripts, "javascript"));
-        array_unshift($blocks, $this->combine_files($this->css, "css"));
-      }
-
       if (Session::instance()->get("debug")) {
         if ($function != "head" && $function != "body_attributes") {
           array_unshift(
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index c8041069..54b30c6f 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -4,6 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <? $theme->start_combining("script,css") ?>
     <title>
       <? if ($page_title): ?>
         <?= t("Gallery Admin: %page_title", array("page_title" => $page_title)) ?>
@@ -11,8 +12,26 @@
         <?= t("Admin dashboard") ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
+    <link rel="shortcut icon"
+          href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
+          type="image/x-icon" />
 
+    <?= $theme->script("jquery.js") ?>
+    <?= $theme->script("jquery.form.js") ?>
+    <?= $theme->script("jquery-ui.js") ?>
+    <?= $theme->script("gallery.common.js") ?>
+    <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
+    <script type="text/javascript">
+    var MSG_CANCEL = <?= t("Cancel")->for_js() ?>;
+    </script>
+    <?= $theme->script("gallery.ajax.js") ?>
+    <?= $theme->script("gallery.dialog.js") ?>
+    <?= $theme->script("superfish/js/superfish.js") ?>
+
+    <?= $theme->admin_head() ?>
+
+    <? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
+    <?= $theme->script("ui.init.js") ?>
     <?= $theme->css("yui/reset-fonts-grids.css") ?>
     <?= $theme->css("themeroller/ui.base.css") ?>
     <?= $theme->css("superfish/css/superfish.css") ?>
@@ -22,20 +41,11 @@
           media="screen,print,projection" />
     <![endif]-->
 
-   <?= $theme->script("jquery.js") ?>
-   <?= $theme->script("jquery.form.js") ?>
-   <?= $theme->script("jquery-ui.js") ?>
-   <?= $theme->script("gallery.common.js") ?>
-   <? /* MSG_CANCEL is required by gallery.dialog.js */ ?>
-   <script type="text/javascript">
-   var MSG_CANCEL = <?= t("Cancel")->for_js() ?>;
-   </script>
-   <?= $theme->script("gallery.ajax.js") ?>
-   <?= $theme->script("gallery.dialog.js") ?>
-   <?= $theme->script("superfish/js/superfish.js") ?>
-   <?= $theme->script("ui.init.js") ?>
+    <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
+    <?= $theme->get_combined("script") ?>
 
-   <?= $theme->admin_head() ?>
+    <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
+    <?= $theme->get_combined("css") ?>
   </head>
 
   <body <?= $theme->body_attributes() ?>>
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 90f76bb5..441866d5 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -4,6 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+    <? $theme->start_combining("script,css") ?>
     <title>
       <? if ($page_title): ?>
         <?= $page_title ?>
@@ -17,28 +18,24 @@
         <? endif ?>
       <? endif ?>
     </title>
-    <link rel="shortcut icon" href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>" type="image/x-icon" />
-    <?= $theme->css("yui/reset-fonts-grids.css") ?>
-    <?= $theme->css("superfish/css/superfish.css") ?>
-    <?= $theme->css("themeroller/ui.base.css") ?>
-    <?= $theme->css("screen.css") ?>
-    <!--[if lte IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
-          media="screen,print,projection" />
-    <![endif]-->
+    <link rel="shortcut icon"
+          href="<?= url::file(module::get_var("gallery", "favicon_url")) ?>"
+          type="image/x-icon" />
+
     <? if ($theme->page_type == "collection"): ?>
       <? if ($thumb_proportion != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
         <? $new_height = round($thumb_proportion * 240) ?>
-    <style type="text/css">
-    .g-view #g-content #g-album-grid .g-item {
-      width: <?= $new_width ?>px;
-      height: <?= $new_height ?>px;
-      /* <?= $thumb_proportion ?> */
-    }
-    </style>
+        <style type="text/css">
+        .g-view #g-content #g-album-grid .g-item {
+          width: <?= $new_width ?>px;
+          height: <?= $new_height ?>px;
+          /* <?= $thumb_proportion ?> */
+        }
+        </style>
       <? endif ?>
     <? endif ?>
+
     <?= $theme->script("json2-min.js") ?>
     <?= $theme->script("jquery.js") ?>
     <?= $theme->script("jquery.form.js") ?>
@@ -52,9 +49,8 @@
     <?= $theme->script("gallery.dialog.js") ?>
     <?= $theme->script("superfish/js/superfish.js") ?>
     <?= $theme->script("jquery.localscroll.js") ?>
-    <?= $theme->script("ui.init.js") ?>
 
-    <? /* These are page specific, but if we put them before $theme->head() they get combined */ ?>
+    <? /* These are page specific but they get combined */ ?>
     <? if ($theme->page_subtype == "photo"): ?>
     <?= $theme->script("jquery.scrollTo.js") ?>
     <?= $theme->script("gallery.show_full_size.js") ?>
@@ -63,6 +59,23 @@
     <? endif ?>
 
     <?= $theme->head() ?>
+
+    <? /* Theme specific CSS/JS goes last so that it can override module CSS/JS */ ?>
+    <?= $theme->script("ui.init.js") ?>
+    <?= $theme->css("yui/reset-fonts-grids.css") ?>
+    <?= $theme->css("superfish/css/superfish.css") ?>
+    <?= $theme->css("themeroller/ui.base.css") ?>
+    <?= $theme->css("screen.css") ?>
+    <!--[if lte IE 8]>
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+          media="screen,print,projection" />
+    <![endif]-->
+
+    <!-- LOOKING FOR YOUR JAVASCRIPT? It's all been combined into the link below -->
+    <?= $theme->get_combined("script") ?>
+
+    <!-- LOOKING FOR YOUR CSS? It's all been combined into the link below -->
+    <?= $theme->get_combined("css") ?>
   </head>
 
   <body <?= $theme->body_attributes() ?>>
-- 
cgit v1.2.3