From: Sem <sembrestels@riseup.net>
Date: Sun, 29 Jul 2012 02:50:38 +0000 (+0200)
Subject: Merge branch 'sort-as-title-button' of git://github.com/sembrestels/Tidypics
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=71e6db3c3dff9c9ec7e8109fc990f0d960273c9f;p=lorea%2Felgg.git

Merge branch 'sort-as-title-button' of git://github.com/sembrestels/Tidypics
---

71e6db3c3dff9c9ec7e8109fc990f0d960273c9f
diff --cc start.php
index b365a65a7,363b9ae97..07100fb8a
--- a/start.php
+++ b/start.php
@@@ -306,9 -329,21 +306,9 @@@ function tidypics_entity_menu_setup($ho
  			);
  			$return[] = ElggMenuItem::factory($options);
  		}
 -
 -		if (elgg_get_plugin_setting('tagging', 'tidypics')) {
 -			$options = array(
 -				'name' => 'tagging',
 -				'text' => elgg_echo('tidypics:actiontag'),
 -				'href' => '#',
 -				'title' => elgg_echo('tidypics:tagthisphoto'),
 -				'rel' => 'photo-tagging',
 -				'priority' => 80,
 -			);
 -			$return[] = ElggMenuItem::factory($options);
 -		}
  	}
  
- 	// only show these options if there are images
+ 	// only show slideshow link if there are images
  	if (elgg_instanceof($entity, 'object', 'album') && $entity->getSize() > 0) {
  		$url = $entity->getURL() . '?limit=50&view=rss';
  		$url = elgg_format_url($url);