From b826182b7a7b2d630b478d3e2bcf0628989a92d9 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Thu, 6 Aug 2009 22:22:24 +0800
Subject: Cleanup the javascript for enabling dialog or panel links. 1) We
 don't need to loop over the elements to bind the event handler. 2) Just
 include gallery.panel.js for all the admin pages.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
---
 modules/gallery/helpers/gallery_theme.php |  1 +
 modules/user/helpers/user_theme.php       |  6 ------
 themes/admin_default/js/ui.init.js        | 12 +++---------
 themes/default/js/ui.init.js              |  5 +----
 4 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index d3751b80..903827cc 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -78,6 +78,7 @@ class gallery_theme_Core {
   }
 
   static function admin_head($theme) {
+    $theme->script("gallery.panel.js");
     $session = Session::instance();
     if ($session->get("debug")) {
       $theme->css("debug.css");
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index c5351f8e..69042aed 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -23,10 +23,4 @@ class user_theme_Core {
     $view->user = user::active();
     return $view->render();
   }
-
-  static function admin_head($theme) {
-    if (strpos(Router::$current_uri, "admin/users") !== false) {
-      $theme->script("gallery.panel.js");
-    }
-  }
 }
diff --git a/themes/admin_default/js/ui.init.js b/themes/admin_default/js/ui.init.js
index 3f062a27..06cc1cd5 100644
--- a/themes/admin_default/js/ui.init.js
+++ b/themes/admin_default/js/ui.init.js
@@ -1,5 +1,5 @@
 $(document).ready(function(){
-  
+
   // Initialize Superfish menus
   $("#gSiteAdminMenu ul.gMenu").addClass("sf-menu");
   $("ul.gMenu").addClass("sf-menu");
@@ -18,16 +18,10 @@ $(document).ready(function(){
   $("#gMessage li").showMessage();
 
   // Initialize modal dialogs
-  var dialogLinks = $(".gDialogLink");
-  for (var i=0; i < dialogLinks.length; i++) {
-    $(dialogLinks[i]).bind("click", handleDialogEvent);
-  }
+  $(".gDialogLink").bind("click", handleDialogEvent);
 
   // Initialize panels
-  var panelLinks = $(".gPanelLink");
-  for (i=0; i<panelLinks.length; i++) {
-    $(panelLinks[i]).bind("click", handlePanelEvent);
-  }
+  $(".gPanelLink").bind("click", handlePanelEvent);
 
   if ($("#gPhotoStream").length) {
     // Vertically align thumbs in photostream
diff --git a/themes/default/js/ui.init.js b/themes/default/js/ui.init.js
index 11cd06ed..ff76c79c 100644
--- a/themes/default/js/ui.init.js
+++ b/themes/default/js/ui.init.js
@@ -34,10 +34,7 @@ $(document).ready(function() {
   // Initialize dialogs
   $(".gMenuLink").addClass("gDialogLink");
   $("#gLoginLink").addClass("gDialogLink");
-  var dialogLinks = $(".gDialogLink");
-  for (var i=0; i < dialogLinks.length; i++) {
-    $(dialogLinks[i]).bind("click", handleDialogEvent);
-  }
+  $(".gDialogLink").bind("click", handleDialogEvent);
 
   // Initialize view menu
   if ($("#gViewMenu").length) {
-- 
cgit v1.2.3


From 87598288f493cadcc5c273dd7305ad579d251678 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Thu, 6 Aug 2009 20:38:42 -0700
Subject: If we fail the version check, at least show the version of PHP that
 the server is using.

---
 index.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 7def7d16..d0e12cfc 100644
--- a/index.php
+++ b/index.php
@@ -21,7 +21,8 @@
 define("IN_PRODUCTION", true);
 
 // Gallery requires PHP 5.2+
-version_compare(PHP_VERSION, "5.2.3", "<") and exit("Gallery requires PHP 5.2.3 or newer.");
+version_compare(PHP_VERSION, "5.2.3", "<") and
+  exit("Gallery requires PHP 5.2.3 or newer (you're using " . PHP_VERSION  . ")");
 
 // Gallery requires short_tags to be on
 !ini_get("short_open_tag") and exit("Gallery requires short_open_tag to be on.");
-- 
cgit v1.2.3