From 50bbc309118cfa1455c66a8e7e67e7d9dd513099 Mon Sep 17 00:00:00 2001
From: Mike Miller <github@mikeage.net>
Date: Thu, 31 Jan 2013 10:55:27 +0200
Subject: [PATCH] Modify dynamic, latestupdates, and tag_albums to export a
 siblings_callback

---
 3.0/modules/dynamic/controllers/dynamic.php           |  3 ++-
 .../latestupdates/controllers/latestupdates.php       |  1 +
 3.0/modules/tag_albums/controllers/tag_albums.php     | 11 ++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/3.0/modules/dynamic/controllers/dynamic.php b/3.0/modules/dynamic/controllers/dynamic.php
index ac681079..fe309080 100644
--- a/3.0/modules/dynamic/controllers/dynamic.php
+++ b/3.0/modules/dynamic/controllers/dynamic.php
@@ -94,10 +94,11 @@ class Dynamic_Controller extends Controller {
                  "previous_item" => $previous_item,
                  "next_item" => $next_item,
                  "sibling_count" => dynamic::get_display_count($album_defn),
+                 "siblings_callback" => array("dynamic::items", array($album_defn->key_field)),
                  "breadcrumbs" => array(
                    Breadcrumb::instance($root->title, $root->url())->set_first(),
                    Breadcrumb::instance($album_defn->title,
                                         url::site("dynamic/$path?show={$item->id}")),
                    Breadcrumb::instance($item->title, $item->url())->set_last()));
   }
-}
\ No newline at end of file
+}
diff --git a/3.0/modules/latestupdates/controllers/latestupdates.php b/3.0/modules/latestupdates/controllers/latestupdates.php
index ff4d0bda..fb9a8f2e 100644
--- a/3.0/modules/latestupdates/controllers/latestupdates.php
+++ b/3.0/modules/latestupdates/controllers/latestupdates.php
@@ -392,6 +392,7 @@ class latestupdates_Controller extends Controller {
                  "previous_item" => $previous_item,
                  "next_item" => $next_item,
                  "sibling_count" => $count,
+                 "siblings_callback" => array("latestupdates_Controller::items", array($str_display_type, $user_id)),
                  "breadcrumbs" => $breadcrumbs
                 );
   }
diff --git a/3.0/modules/tag_albums/controllers/tag_albums.php b/3.0/modules/tag_albums/controllers/tag_albums.php
index 9a492907..aec6c00a 100644
--- a/3.0/modules/tag_albums/controllers/tag_albums.php
+++ b/3.0/modules/tag_albums/controllers/tag_albums.php
@@ -379,7 +379,7 @@ class tag_albums_Controller extends Controller {
     $template->page_title = $display_tag->name;
     $template->content = new View("dynamic.html");
     $template->content->title = $display_tag->name;
-    $template->content->description = $page_description;
+    $template->content->description = isset($page_description) ? $page_description : "";
 
     $template->set_global("all_siblings", $this->_get_records(Array($id), $count, 0, "items." . $sort_page_field, $sort_page_direction, "OR", false));
     print $template;
@@ -603,7 +603,9 @@ class tag_albums_Controller extends Controller {
     $next_item = "";
     $position = 0;
     $dynamic_siblings = "";
+    $siblings_callback_param=array();
     if ($tag_id > 0) {	
+      $album_tags_search_type = "";
       $sibling_count = tag_albums_Controller::_count_records(Array($tag_id), "OR", false);
       $position = tag_albums_Controller::_get_position($item->$sort_page_field, $item->id, Array($tag_id), "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
       if ($position > 1) {
@@ -617,6 +619,7 @@ class tag_albums_Controller extends Controller {
         $next_item = $next_item_object[0];
       }
       $dynamic_siblings = tag_albums_Controller::_get_records(Array($tag_id), $sibling_count, 0, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
+      $siblings_callback_param= array(Array($tag_id), $sibling_count, 0, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
     } else {
       $tag_ids = Array();
       foreach (explode(",", $album_tags[0]->tags) as $tag_name) {
@@ -639,6 +642,7 @@ class tag_albums_Controller extends Controller {
         $next_item = $next_item_object[0];
       }
       $dynamic_siblings = tag_albums_Controller::_get_records($tag_ids, $sibling_count, 0, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
+      $siblings_callback_param= array($tag_ids, $sibling_count, 0, "items." . $sort_page_field, $sort_page_direction, $album_tags_search_type, false);
     }
 
     // Set up breadcrumbs
@@ -674,6 +678,7 @@ class tag_albums_Controller extends Controller {
                  "is_tagalbum_page" => true,
                  "dynamic_siblings" => $dynamic_siblings,
                  "sibling_count" => $sibling_count,
+                 "siblings_callback" => array("tag_albums_Controller::get_siblings", $siblings_callback_param),
                  "breadcrumbs" => $tag_album_breadcrumbs);
   }
 
@@ -755,6 +760,10 @@ class tag_albums_Controller extends Controller {
     return ($position);
   }
 
+  public function get_siblings($tag_ids, $page_size, $offset, $sort_field, $sort_direction, $search_type, $include_albums) {
+	  return tag_albums_Controller::_get_records($tag_ids, $page_size, $offset, $sort_field, $sort_direction, $search_type, $include_albums);
+  } 
+
   private function _get_records($tag_ids, $page_size, $offset, $sort_field, $sort_direction, $search_type, $include_albums) {
     // Returns an array of items to be displayed on the current page.