From ba62fb4b0e9fe2d64803c165a21756e0919c0238 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Thu, 22 Oct 2009 22:06:36 -0600
Subject: Standardize message markup, make the update block status message
 translatable.

---
 modules/gallery/controllers/admin_sidebar.php | 3 ++-
 modules/gallery/views/admin_sidebar.html.php  | 8 +++++---
 modules/tag/js/tag.js                         | 5 ++++-
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/controllers/admin_sidebar.php b/modules/gallery/controllers/admin_sidebar.php
index f029d259..c83b5a37 100644
--- a/modules/gallery/controllers/admin_sidebar.php
+++ b/modules/gallery/controllers/admin_sidebar.php
@@ -47,7 +47,8 @@ class Admin_Sidebar_Controller extends Admin_Controller {
     $v = new View("admin_sidebar_blocks.html");
     $v->blocks = $active;
     $result["active"] = $v->render();
-
+    $message = t("Updated sidebar blocks");
+    $result["message"] = (string) $message;
     print json_encode($result);
   }
 
diff --git a/modules/gallery/views/admin_sidebar.html.php b/modules/gallery/views/admin_sidebar.html.php
index f784b1a5..7c97270c 100644
--- a/modules/gallery/views/admin_sidebar.html.php
+++ b/modules/gallery/views/admin_sidebar.html.php
@@ -21,10 +21,12 @@
             if (data.result == "success") {
               $("ul#g-available-blocks").html(data.available);
               $("ul#g-active-blocks").html(data.active);
-              var message = "Updated blocks";
               $("#g-action-status").remove();
-              $("#g-block-admin").before("<ul id=\"g-action-status\" class=\"g-message-block\"><li class=\"g-success\">" + message + "</li></ul>");
-              $("#g-action-status").fadeTo(1000,1).fadeTo(2000,0);
+              var message = "<ul id=\"g-action-status\" class=\"g-message-block\">";
+              message += "<li class=\"g-success\">" + data.message + "</li>";
+              message += "</ul>";
+              $("#g-block-admin").before(message);
+              $("#g-action-status li").gallery_show_message();
             }
           });
         }
diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js
index ed977480..8cb4e571 100644
--- a/modules/tag/js/tag.js
+++ b/modules/tag/js/tag.js
@@ -72,7 +72,10 @@ function editInPlace(element) {
           $("#g-rename-tag-form #name")
             .addClass("g-error")
             .focus();
-          $("#g-tag-admin").before("<p id=\"g-action-status\" class=\"g-message-block g-error\">" + data.message + "</p>");
+          var message = "<ul id=\"g-action-status\" class=\"g-message-block\">";
+          message += "<li class=\"g-error\">" + data.message + "</li>";
+          message += "</ul>";
+          $("#g-tag-admin").before(message);
         }
       }
     });
-- 
cgit v1.2.3


From 80c6bf789b4a9925e86abdb3275cc570f9c2d6ad Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Thu, 22 Oct 2009 22:28:55 -0600
Subject: Make g-inline more specific, replace universal selector with an li
 since this class will most often be used with order and unordered lists.
 Apply g-inline to the the login menu and footer credits.

---
 lib/gallery.common.css                |  2 +-
 modules/gallery/views/login.html.php  |  2 +-
 themes/night_wind/css/screen.css      | 13 ++++---------
 themes/night_wind/views/page.html.php |  4 ++--
 themes/wind/css/screen.css            | 15 ++++++---------
 themes/wind/views/page.html.php       |  4 ++--
 6 files changed, 16 insertions(+), 24 deletions(-)

(limited to 'modules')

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 77653d00..51d50dfc 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -482,7 +482,7 @@ div#g-action-status {
 
 /* Inline layout  ~~~~~~~~~~ */
 
-.g-inline * {
+.g-inline li {
   float: left;
   margin-right: .4em;
 }
diff --git a/modules/gallery/views/login.html.php b/modules/gallery/views/login.html.php
index 9be218c0..3b327e31 100644
--- a/modules/gallery/views/login.html.php
+++ b/modules/gallery/views/login.html.php
@@ -1,5 +1,5 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<ul id="g-login-menu">
+<ul id="g-login-menu" class="g-inline">
   <? if ($user->guest): ?>
   <li class="first">
     <a href="<?= url::site("login/ajax") ?>"
diff --git a/themes/night_wind/css/screen.css b/themes/night_wind/css/screen.css
index 7711a329..dfc94b6d 100644
--- a/themes/night_wind/css/screen.css
+++ b/themes/night_wind/css/screen.css
@@ -446,15 +446,6 @@ li.g-error select {
 
 /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-banner #g-login-menu li,
-#g-footer #g-credits li {
-  display: inline;
-}
-
-#g-banner #g-login-menu li {
-  padding-left: 1.2em;
-}
-
 #g-footer #g-credits li {
   padding-right: 1.2em;
 }
@@ -480,6 +471,10 @@ li.g-error select {
   float: right;
 }
 
+#g-banner #g-login-menu li {
+  padding-left: 1.2em;
+}
+
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-site-menu {
diff --git a/themes/night_wind/views/page.html.php b/themes/night_wind/views/page.html.php
index f5c6b0df..a14a3278 100644
--- a/themes/night_wind/views/page.html.php
+++ b/themes/night_wind/views/page.html.php
@@ -124,14 +124,14 @@
           <? endif ?>
         </div>
       </div>
-      <div id="g-footer">
+      <div id="g-footer" class="ui-helper-clearfix">
         <?= $theme->footer() ?>
         <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
         <?= $footer_text ?>
         <? endif ?>
 
         <? if (module::get_var("gallery", "show_credits")): ?>
-        <ul id="g-credits">
+        <ul id="g-credits" class="g-inline">
           <?= $theme->credits() ?>
         </ul>
         <? endif ?>
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index fcbf63ea..ef2f1510 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -12,6 +12,8 @@
  *  6)  Browser hacks
  *  7)  jQuery and jQuery UI
  *  8)  Right-to-left language styles
+ *
+ *  @todo Move #g-admin-g2-import stuff to g2import module
  */
 
 /** *******************************************************************
@@ -329,15 +331,6 @@ td {
 
 /* Footer content ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-banner #g-login-menu li,
-#g-footer #g-credits li {
-  display: inline;
-}
-
-#g-banner #g-login-menu li {
-  padding-left: 1.2em;
-}
-
 #g-footer #g-credits li {
   padding-right: 1.2em;
 }
@@ -362,6 +355,10 @@ td {
   float: right;
 }
 
+#g-banner #g-login-menu li {
+  padding-left: 1.2em;
+}
+
 /* Site Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-site-menu {
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index f5c6b0df..a14a3278 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -124,14 +124,14 @@
           <? endif ?>
         </div>
       </div>
-      <div id="g-footer">
+      <div id="g-footer" class="ui-helper-clearfix">
         <?= $theme->footer() ?>
         <? if ($footer_text = module::get_var("gallery", "footer_text")): ?>
         <?= $footer_text ?>
         <? endif ?>
 
         <? if (module::get_var("gallery", "show_credits")): ?>
-        <ul id="g-credits">
+        <ul id="g-credits" class="g-inline">
           <?= $theme->credits() ?>
         </ul>
         <? endif ?>
-- 
cgit v1.2.3


From da73c0c25f406ccef8351be06ab30fd0d71977b8 Mon Sep 17 00:00:00 2001
From: Chad Kieffer <ckieffer@gmail.com>
Date: Thu, 22 Oct 2009 23:36:05 -0600
Subject: Poor man's merge. Note to self, git pull before working. Next pound
 the steps to merge into your head.

---
 installer/install.sql                  | 2 +-
 modules/gallery/controllers/albums.php | 5 ++++-
 modules/gallery/controllers/photos.php | 5 ++++-
 modules/gallery/helpers/module.php     | 2 +-
 modules/gallery/helpers/photo.php      | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)
 mode change 100755 => 100644 installer/install.sql

(limited to 'modules')

diff --git a/installer/install.sql b/installer/install.sql
old mode 100755
new mode 100644
index da349c36..9ec6ff48
--- a/installer/install.sql
+++ b/installer/install.sql
@@ -175,7 +175,7 @@ CREATE TABLE {items} (
   KEY `weight` (`weight`)
 ) AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
 SET character_set_client = @saved_cs_client;
-INSERT INTO {items} VALUES (1,NULL,NULL,UNIX_TIMESTAMP(),'',NULL,1,1,NULL,NULL,NULL,0,NULL,'','',1,NULL,NULL,2,NULL,'weight','ASC',1,NULL,NULL,'Gallery','album',UNIX_TIMESTAMP(),0,1,NULL,'1','1');
+INSERT INTO {items} VALUES (1,NULL,NULL,UNIX_TIMESTAMP(),'',NULL,1,1,NULL,NULL,2,0,NULL,'','',1,NULL,NULL,2,NULL,'weight','ASC',1,NULL,NULL,'Gallery','album',UNIX_TIMESTAMP(),0,1,NULL,'1','1');
 DROP TABLE IF EXISTS {items_tags};
 SET @saved_cs_client     = @@character_set_client;
 SET character_set_client = utf8;
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php
index 9733d1cd..21e37073 100644
--- a/modules/gallery/controllers/albums.php
+++ b/modules/gallery/controllers/albums.php
@@ -200,6 +200,8 @@ class Albums_Controller extends Items_Controller {
     }
 
     if ($valid) {
+      $watching_album = $album->url() != ($location = parse_url(request::referrer(), PHP_URL_PATH));
+
       $album->title = $form->edit_item->title->value;
       $album->description = $form->edit_item->description->value;
       $album->sort_column = $form->edit_item->sort_order->column->value;
@@ -216,7 +218,8 @@ class Albums_Controller extends Items_Controller {
                          array("album_title" => html::purify($album->title))));
 
       print json_encode(
-        array("result" => "success"));
+        array("result" => "success",
+              "location" => $watching_album ? $location : $album->url()));
     } else {
       print json_encode(
         array("result" => "error",
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index fbff53ce..54cd63c6 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -100,6 +100,8 @@ class Photos_Controller extends Items_Controller {
     }
 
     if ($valid) {
+      $watching_album = $photo->url() != ($location = parse_url(request::referrer(), PHP_URL_PATH));
+
       $photo->title = $form->edit_item->title->value;
       $photo->description = $form->edit_item->description->value;
       $photo->slug = $form->edit_item->slug->value;
@@ -113,7 +115,8 @@ class Photos_Controller extends Items_Controller {
                          array("photo_title" => html::purify($photo->title))));
 
       print json_encode(
-        array("result" => "success"));
+        array("result" => "success",
+              "location" => $watching_album ? $location : $photo->url()));
     } else {
       print json_encode(
         array("result" => "error",
diff --git a/modules/gallery/helpers/module.php b/modules/gallery/helpers/module.php
index 77ec6f63..5b34f453 100644
--- a/modules/gallery/helpers/module.php
+++ b/modules/gallery/helpers/module.php
@@ -253,7 +253,7 @@ class module_Core {
       call_user_func(array($installer_class, "uninstall"));
     }
 
-    graphics::remove_rule($module_name);
+    graphics::remove_rules($module_name);
     $module = self::get($module_name);
     if ($module->loaded) {
       $module->delete();
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php
index 6677ddc9..d1d8fb1f 100644
--- a/modules/gallery/helpers/photo.php
+++ b/modules/gallery/helpers/photo.php
@@ -26,7 +26,7 @@
 class photo_Core {
   /**
    * Create a new photo.
-   * @param integer $parent_id id of parent album
+   * @param integer $parent parent album
    * @param string  $filename path to the photo file on disk
    * @param string  $name the filename to use for this photo in the album
    * @param integer $title the title of the new photo
-- 
cgit v1.2.3


From b3e175006cc3be2c1793797e726095520ba16d9c Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Oct 2009 07:48:07 -0700
Subject: Move the filters that the File_Structure_Test use into a seperate
 file so other tests. can use them.  Add a No_Direct_ORM_Access_Test to find
 all places that the user or group table are accessed outside of the user
 module.  This test will fail at this point, as it in preparation for the
 IdentityProvider refactor.

---
 modules/gallery/tests/File_Structure_Test.php    | 32 +---------
 modules/gallery/tests/Gallery_Filters.php        | 48 +++++++++++++++
 modules/user/tests/No_Direct_ORM_Access_Test.php | 77 ++++++++++++++++++++++++
 3 files changed, 127 insertions(+), 30 deletions(-)
 create mode 100644 modules/gallery/tests/Gallery_Filters.php
 create mode 100644 modules/user/tests/No_Direct_ORM_Access_Test.php

(limited to 'modules')

diff --git a/modules/gallery/tests/File_Structure_Test.php b/modules/gallery/tests/File_Structure_Test.php
index 9018f4c6..ff9ff1a1 100644
--- a/modules/gallery/tests/File_Structure_Test.php
+++ b/modules/gallery/tests/File_Structure_Test.php
@@ -17,6 +17,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
+require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
+
 class File_Structure_Test extends Unit_Test_Case {
   public function no_trailing_closing_php_tag_test() {
     $dir = new GalleryCodeFilterIterator(
@@ -261,33 +263,3 @@ class File_Structure_Test extends Unit_Test_Case {
     }
   }
 }
-
-class PhpCodeFilterIterator extends FilterIterator {
-  public function accept() {
-    $path_name = $this->getInnerIterator()->getPathName();
-    return substr($path_name, -4) == ".php";
-  }
-}
-
-class GalleryCodeFilterIterator extends FilterIterator {
-  public function accept() {
-    // Skip anything that we didn"t write
-    $path_name = $this->getInnerIterator()->getPathName();
-    return !(
-      strpos($path_name, ".svn") ||
-      strpos($path_name, DOCROOT . "test") !== false ||
-      strpos($path_name, DOCROOT . "var") !== false ||
-      strpos($path_name, MODPATH . "forge") !== false ||
-      strpos($path_name, MODPATH . "gallery/views/kohana_error_page.php") !== false ||
-      strpos($path_name, MODPATH . "gallery/views/kohana_profiler.php") !== false ||
-      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_error_page.php") !== false ||
-      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_unit_test_cli.php") !== false ||
-      strpos($path_name, MODPATH . "unit_test") !== false ||
-      strpos($path_name, MODPATH . "exif/lib") !== false ||
-      strpos($path_name, MODPATH . "user/lib/PasswordHash") !== false ||
-      strpos($path_name, DOCROOT . "lib/swfupload") !== false ||
-      strpos($path_name, SYSPATH) !== false ||
-      strpos($path_name, MODPATH . "gallery/libraries/HTMLPurifier") !== false ||
-      substr($path_name, -1, 1) == "~");
-  }
-}
diff --git a/modules/gallery/tests/Gallery_Filters.php b/modules/gallery/tests/Gallery_Filters.php
new file mode 100644
index 00000000..d1bc2cfa
--- /dev/null
+++ b/modules/gallery/tests/Gallery_Filters.php
@@ -0,0 +1,48 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class PhpCodeFilterIterator extends FilterIterator {
+  public function accept() {
+    $path_name = $this->getInnerIterator()->getPathName();
+    return substr($path_name, -4) == ".php";
+  }
+}
+
+class GalleryCodeFilterIterator extends FilterIterator {
+  public function accept() {
+    // Skip anything that we didn"t write
+    $path_name = $this->getInnerIterator()->getPathName();
+    return !(
+      strpos($path_name, ".svn") ||
+      strpos($path_name, DOCROOT . "test") !== false ||
+      strpos($path_name, DOCROOT . "var") !== false ||
+      strpos($path_name, MODPATH . "forge") !== false ||
+      strpos($path_name, MODPATH . "gallery/views/kohana_error_page.php") !== false ||
+      strpos($path_name, MODPATH . "gallery/views/kohana_profiler.php") !== false ||
+      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_error_page.php") !== false ||
+      strpos($path_name, MODPATH . "gallery_unit_test/views/kohana_unit_test_cli.php") !== false ||
+      strpos($path_name, MODPATH . "unit_test") !== false ||
+      strpos($path_name, MODPATH . "exif/lib") !== false ||
+      strpos($path_name, MODPATH . "user/lib/PasswordHash") !== false ||
+      strpos($path_name, DOCROOT . "lib/swfupload") !== false ||
+      strpos($path_name, SYSPATH) !== false ||
+      strpos($path_name, MODPATH . "gallery/libraries/HTMLPurifier") !== false ||
+      substr($path_name, -1, 1) == "~");
+  }
+}
diff --git a/modules/user/tests/No_Direct_ORM_Access_Test.php b/modules/user/tests/No_Direct_ORM_Access_Test.php
new file mode 100644
index 00000000..440321fa
--- /dev/null
+++ b/modules/user/tests/No_Direct_ORM_Access_Test.php
@@ -0,0 +1,77 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 Bharat Mediratta
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+require_once(MODPATH . "gallery/tests/Gallery_Filters.php");
+
+class No_Direct_ORM_Access_Test extends Unit_Test_Case {
+  public function no_access_to_users_table_test() {
+    $dir = new UserModuleFilterIterator(
+      new PhpCodeFilterIterator(
+        new GalleryCodeFilterIterator(
+          new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(DOCROOT)))));
+    $errors = array();
+    foreach ($dir as $file) {
+      //if (basename(dirname($file)) == "helpers") {
+      $file_as_string = file_get_contents($file);
+      if (preg_match("/ORM::factory\\(\"user\"/", $file_as_string)) {
+        foreach (split("\n", $file_as_string) as $l => $line) {
+          if (preg_match('/ORM::factory\\(\"user\"/', $line)) {
+            $errors[] = "$file($l) => $line";
+          }
+        }
+      }
+      $file_as_string = null;
+    }
+    if ($errors) {
+      $this->assert_false(true, "Direct access to the users table found:\n" . join("\n", $errors));
+    }
+  }
+
+  public function no_access_to_groups_table_test() {
+    $dir = new UserModuleFilterIterator(
+      new PhpCodeFilterIterator(
+        new GalleryCodeFilterIterator(
+          new RecursiveIteratorIterator(
+            new RecursiveDirectoryIterator(DOCROOT)))));
+    $errors = array();
+    foreach ($dir as $file) {
+      $file_as_string = file_get_contents($file);
+      if (preg_match("/ORM::factory\\(\"group\"/", $file_as_string)) {
+        foreach (split("\n", $file_as_string) as $l => $line) {
+          if (preg_match('/ORM::factory\\(\"group\"/', $line)) {
+            $errors[] = "$file($l) => $line";
+          }
+        }
+      }
+      $file_as_string = null;
+    }
+    if ($errors) {
+      $this->assert_false(true, "Direct access to the groups table found:\n" . join("\n", $errors));
+    }
+  }
+
+}
+
+class UserModuleFilterIterator extends FilterIterator {
+  public function accept() {
+    $path_name = $this->getInnerIterator()->getPathName();
+    return strpos($path_name, "/modules/user") === false;
+  }
+}
-- 
cgit v1.2.3


From 94cd07805dfad6131f0bcb33bf437a31d1f4d336 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Fri, 23 Oct 2009 07:49:14 -0700
Subject: Change the gallery_unit test to only intall into the test
 environment, modules that are active in the non-test environment.

---
 modules/gallery_unit_test/controllers/gallery_unit_test.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery_unit_test/controllers/gallery_unit_test.php b/modules/gallery_unit_test/controllers/gallery_unit_test.php
index a5dbcc1f..85747884 100644
--- a/modules/gallery_unit_test/controllers/gallery_unit_test.php
+++ b/modules/gallery_unit_test/controllers/gallery_unit_test.php
@@ -96,6 +96,8 @@ class Gallery_Unit_Test_Controller extends Controller {
       @system("rm -rf test/var");
       @mkdir('test/var/logs', 0777, true);
 
+      $active_modules = module::$active;
+
       // Reset our caches
       module::$modules = array();
       module::$active = array();
@@ -113,13 +115,12 @@ class Gallery_Unit_Test_Controller extends Controller {
       module::install("user");
       module::activate("user");
       $modules = array();
-      foreach (glob(MODPATH . "*/helpers/*_installer.php") as $file) {
-        $module_name = basename(dirname(dirname($file)));
-        if (in_array($module_name, array("gallery", "user"))) {
+      foreach ($active_modules as $module) {
+        if (in_array($module->name, array("gallery", "user"))) {
           continue;
         }
-        module::install($module_name);
-        module::activate($module_name);
+        module::install($module->name);
+        module::activate($module->name);
       }
 
       // Trigger late-binding install actions (defined in gallery_event::user_login)
-- 
cgit v1.2.3