From e44053f692109069977c097ecd24c45ab8e2f228 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Tue, 23 Jun 2009 21:42:25 -0700
Subject: Cache the page_type in pane() instead of looking it up twice.

---
 modules/gallery/controllers/quick.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/gallery/controllers/quick.php b/modules/gallery/controllers/quick.php
index 6203728c..e89d9701 100644
--- a/modules/gallery/controllers/quick.php
+++ b/modules/gallery/controllers/quick.php
@@ -25,10 +25,10 @@ class Quick_Controller extends Controller {
     }
 
     $view = new View("quick_pane.html");
-    $view->button_list =
-      gallery_quick::get_quick_buttons($item, Input::instance()->get("page_type"));
+    $page_type = Input::instance()->get("page_type");
+    $view->button_list = gallery_quick::get_quick_buttons($item, $page_type);
     $view->item = $item;
-    $view->page_type = Input::instance()->get("page_type");
+    $view->page_type = $page_type;
     print $view;
   }
 
-- 
cgit v1.2.3


From 0735cfb30cc018387ae664374fc65bffdecf0907 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 24 Jun 2009 11:06:36 -0700
Subject: "the the" -> "the"

---
 installer/web.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/installer/web.php b/installer/web.php
index 61f26f7d..78784539 100644
--- a/installer/web.php
+++ b/installer/web.php
@@ -81,7 +81,7 @@ function oops($error) {
 
 function check_environment() {
   if (!function_exists("mysql_query") && !function_exists("mysqli_set_charset")) {
-    $errors[] = "Gallery 3 requires a MySQL database, but PHP doesn't have either the the <a href=\"http://php.net/mysql\">MySQL</a> or the  <a href=\"http://php.net/mysqli\">MySQLi</a> extension.";
+    $errors[] = "Gallery 3 requires a MySQL database, but PHP doesn't have either the <a href=\"http://php.net/mysql\">MySQL</a> or the  <a href=\"http://php.net/mysqli\">MySQLi</a> extension.";
   }
 
   if (!@preg_match("/^.$/u", utf8_encode("\xF1"))) {
-- 
cgit v1.2.3