Merge branch 'colorbox' of git://github.com/sembrestels/Tidypics

Conflicts:
	manifest.xml
	start.php

4 files changed, 0 insertions, 32 deletions

diff --git a/pages/lists/mostrecentimages.php b/pages/lists/mostrecentimages.php
index 0a2595c85..83ec3e988 100644
--- a/pages/lists/mostrecentimages.php
+++ b/pages/lists/mostrecentimages.php
@@ -32,14 +32,6 @@ if ($username) {
 	}
 }
 
-// allow other plugins to override the slideshow
-$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-if ($slideshow_link) {
-	add_submenu_item(elgg_echo('album:slideshow'),
-			$slideshow_link,
-			'photos' );
-}
-
 // how many do we display
 $max = 12;
 
diff --git a/pages/lists/mostviewedimages.php b/pages/lists/mostviewedimages.php
index eb87bc17c..c113c39e2 100644
--- a/pages/lists/mostviewedimages.php
+++ b/pages/lists/mostviewedimages.php
@@ -50,14 +50,6 @@ $photos = tp_get_entities_from_annotations_calculate_x(
 */
 //error_log("custom query is " . (float)(microtime(true) - $start));
 
-// allow other plugins to override the slideshow
-$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-if ($slideshow_link) {
-	add_submenu_item(elgg_echo('album:slideshow'),
-			$slideshow_link,
-			'photos' );
-}
-
 if ($owner_guid) {
 	if ($owner_guid == get_loggedin_userid()) {
 		$title = elgg_echo("tidypics:yourmostviewed");
diff --git a/pages/lists/recentlycommented.php b/pages/lists/recentlycommented.php
index f070e8563..08f69603a 100644
--- a/pages/lists/recentlycommented.php
+++ b/pages/lists/recentlycommented.php
@@ -13,14 +13,6 @@ if (isloggedin()) {
 	set_page_owner(get_loggedin_userid());
 }
 
-// allow other plugins to override the slideshow
-$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-if ($slideshow_link) {
-	add_submenu_item(elgg_echo('album:slideshow'),
-			$slideshow_link,
-			'photos' );
-}
-
 
 global $CONFIG;
 $prefix = $CONFIG->dbprefix;
diff --git a/pages/lists/recentlyviewed.php b/pages/lists/recentlyviewed.php
index 419576d8e..851804e99 100644
--- a/pages/lists/recentlyviewed.php
+++ b/pages/lists/recentlyviewed.php
@@ -13,14 +13,6 @@ if (isloggedin()) {
 	set_page_owner(get_loggedin_userid());
 }
 
-// allow other plugins to override the slideshow
-$slideshow_link = trigger_plugin_hook('tp_slideshow', 'album', array(), null);
-if ($slideshow_link) {
-	add_submenu_item(elgg_echo('album:slideshow'),
-			$slideshow_link,
-			'photos' );
-}
-
 
 global $CONFIG;
 $prefix = $CONFIG->dbprefix;