Merge branch 'master' of git://github.com/gallery/gallery3

2 files changed, 27 insertions, 1 deletions

diff --git a/modules/image_block/controllers/image_block.php b/modules/image_block/controllers/image_block.php
new file mode 100644
index 00000000..94024b3b
--- /dev/null
+++ b/modules/image_block/controllers/image_block.php
@@ -0,0 +1,26 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2012 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_Controller extends Controller {
+  public function random($item_id) {
+    $item = ORM::factory("item", $item_id);
+    item::set_display_context_callback("Albums_Controller::get_display_context");
+    url::redirect($item->abs_url());
+  }
+}
diff --git a/modules/image_block/views/image_block_block.html.php b/modules/image_block/views/image_block_block.html.php
index 2a57c395..6f68e5b8 100644
--- a/modules/image_block/views/image_block_block.html.php
+++ b/modules/image_block/views/image_block_block.html.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.") ?>
 <? foreach ($items as $item): ?>
 <div class="g-image-block">
-  <a href="<?= $item->url() ?>">
+  <a href="<?= url::site("image_block/random/" . $item->id); ?>">
    <?= $item->thumb_img(array("class" => "g-thumbnail")) ?>
   </a>
 </div>