From 1023321cff98f974351defef3b4eabc609a6d85c Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sun, 25 Dec 2011 20:31:42 -0800
Subject: [PATCH] Use Item_Model::relative_url() instead of relying on
 Item_Model::$relative_url_cache directly.

---
 3.0/modules/albumtree/views/albumtree_block_dtree.html.php  | 4 ++--
 3.0/modules/albumtree/views/albumtree_block_list.html.php   | 2 +-
 3.0/modules/albumtree/views/albumtree_block_select.html.php | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/3.0/modules/albumtree/views/albumtree_block_dtree.html.php b/3.0/modules/albumtree/views/albumtree_block_dtree.html.php
index 257181f1..10f6c264 100644
--- a/3.0/modules/albumtree/views/albumtree_block_dtree.html.php
+++ b/3.0/modules/albumtree/views/albumtree_block_dtree.html.php
@@ -247,7 +247,7 @@ dTree.prototype.closeAllChildren = function(node) {
 		if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
 			if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
 			this.aNodes[n]._io = false;
-			this.closeAllChildren(this.aNodes[n]);		
+			this.closeAllChildren(this.aNodes[n]);
 		}
 	}
 }
@@ -398,7 +398,7 @@ albumTree.config.cookieDomain = '';
 <?
 function addtree($album){
 ?>
-albumTree.add(<?= $album->id -1 ?>, <?= $album->parent_id -1 ?>, "<?= $album->title ?>", pf+'<?= $album->relative_url_cache ?>');
+albumTree.add(<?= $album->id -1 ?>, <?= $album->parent_id -1 ?>, "<?= $album->title ?>", pf+'<?= $album->relative_url() ?>');
 <?
   foreach ($album->viewable()->children(null, null, array(array("type", "=", "album"))) as $child){
     addtree($child);
diff --git a/3.0/modules/albumtree/views/albumtree_block_list.html.php b/3.0/modules/albumtree/views/albumtree_block_list.html.php
index 62d8c0ad..58daf0ce 100644
--- a/3.0/modules/albumtree/views/albumtree_block_list.html.php
+++ b/3.0/modules/albumtree/views/albumtree_block_list.html.php
@@ -15,7 +15,7 @@ function makelist($album,$level){
 //print out the list item
 ?>
   <li>
-    <a href="<?= item::root()->url() ?><?= $album->relative_url_cache ?>"><?= str_repeat("&nbsp;&nbsp;", $level) ?><?= $album->title ?></a>
+    <a href="<?= item::root()->url() ?><?= $album->relative_url() ?>"><?= str_repeat("&nbsp;&nbsp;", $level) ?><?= $album->title ?></a>
   </li>
 <?
   //recurse over the children, and print their list items as well
diff --git a/3.0/modules/albumtree/views/albumtree_block_select.html.php b/3.0/modules/albumtree/views/albumtree_block_select.html.php
index c4633d27..cb543c86 100644
--- a/3.0/modules/albumtree/views/albumtree_block_select.html.php
+++ b/3.0/modules/albumtree/views/albumtree_block_select.html.php
@@ -4,7 +4,7 @@
 function makeselect($album, $level){
 //print out the list item as a select option
 ?>
-<option value="<?= item::root()->url() ?><?= $album->relative_url_cache ?>"><?= str_repeat("&nbsp;&nbsp;", $level) ?><?= $album->title ?></option>
+<option value="<?= item::root()->url() ?><?= $album->relative_url() ?>"><?= str_repeat("&nbsp;&nbsp;", $level) ?><?= $album->title ?></option>
 <?
   //recurse over the children, and print their list items as well
   foreach ($album->viewable()->children(null, null, array(array("type", "=", "album"))) as $child){