Merge commit 'upstream/master'

Conflicts:

	modules/gallery/tests/xss_data.txt

3 files changed, 64 insertions, 21 deletions

diff --git a/modules/image_block/helpers/image_block_theme.php b/modules/image_block/helpers/image_block_block.php
index 78138b23..79bd92ba 100644
--- a/modules/image_block/helpers/image_block_theme.php
+++ b/modules/image_block/helpers/image_block_block.php
@@ -17,34 +17,47 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-class image_block_theme_Core {
-  static function sidebar_blocks($theme) {
-    $block = new Block();
-    $block->css_id = "gImageBlock";
-    $block->title = t("Random Image");
-    $block->content = new View("image_block_block.html");
+class image_block_block_Core {
+  static function get_site_list() {
+    return array("random_image" => t("Random image"));
+  }
 
-    $random = ((float)mt_rand()) / (float)mt_getrandmax();
+  static function get($block_id, $theme) {
+    $block = "";
+    switch ($block_id) {
+    case "random_image":
+      $block = new Block();
+      $block->css_id = "g-image-block";
+      $block->title = t("Random image");
+      $block->content = new View("image_block_block.html");
 
-    $items = ORM::factory("item")
-      ->viewable()
-      ->where("type !=", "album")
-      ->where("rand_key < ", $random)
-      ->orderby(array("rand_key" => "DESC"))
-      ->find_all(1);
+      $random = ((float)mt_rand()) / (float)mt_getrandmax();
 
-    if ($items->count() == 0) {
-      // Try once more.  If this fails, just ditch the block altogether
       $items = ORM::factory("item")
         ->viewable()
         ->where("type !=", "album")
-        ->where("rand_key >= ", $random)
+        ->where("rand_key < ", $random)
         ->orderby(array("rand_key" => "DESC"))
         ->find_all(1);
-    }
 
-    $block->content->item = $items->current();
+      if ($items->count() == 0) {
+        // Try once more.  If this fails, just ditch the block altogether
+        $items = ORM::factory("item")
+          ->viewable()
+          ->where("type !=", "album")
+          ->where("rand_key >= ", $random)
+          ->orderby(array("rand_key" => "DESC"))
+          ->find_all(1);
+      }
+
+      if ($items->count() > 0) {
+        $block->content->item = $items->current();
+      } else {
+        $block = "";
+      }
+      break;
+    }
 
-    return $items->count() == 0 ? "" : $block;
+    return $block;
   }
 }
diff --git a/modules/image_block/helpers/image_block_installer.php b/modules/image_block/helpers/image_block_installer.php
new file mode 100644
index 00000000..04a15619
--- /dev/null
+++ b/modules/image_block/helpers/image_block_installer.php
@@ -0,0 +1,30 @@
+<?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 image_block_installer {
+  static function install() {
+    module::set_version("image_block", 2);
+  }
+
+  static function upgrade($version) {
+    if ($version == 1) {
+      module::set_version("image_block", 2);
+    }
+  }
+}
diff --git a/modules/image_block/views/image_block_block.html.php b/modules/image_block/views/image_block_block.html.php
index c51c1b4a..68d5fa89 100644
--- a/modules/image_block/views/image_block_block.html.php
+++ b/modules/image_block/views/image_block_block.html.php
@@ -1,6 +1,6 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
-<div class="gImageBlock">
+<div class="g-image-block">
   <a href="<?= $item->url() ?>">
-   <?= $item->thumb_img(array("class" => "gThumbnail")) ?>
+   <?= $item->thumb_img(array("class" => "g-thumbnail")) ?>
   </a>
 </div>