From e9dab9db7441566a963827da30a56a957458e5a4 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Mon, 25 Feb 2013 21:16:10 +0000
Subject: on picture.php replace U_ADMIN url with U_PHOTO_ADMIN url to avoid
 being overriden by menubar and having to redefine it (U_ADMIN still there for
 2.5 version for backward compatibility)

git-svn-id: http://piwigo.org/svn/trunk@21039 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 picture.php                         | 5 +++--
 themes/default/template/picture.tpl | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/picture.php b/picture.php
index 99c1529e1..092b2aed2 100644
--- a/picture.php
+++ b/picture.php
@@ -772,7 +772,8 @@ if (is_admin())
       'U_CADDIE' => add_url_params($url_self,
                   array('action'=>'add_to_caddie')
                ),
-      'U_ADMIN' => $url_admin,
+      'U_PHOTO_ADMIN' => $url_admin,
+      'U_ADMIN' => $url_admin, // TEMP 2.5 for backward compatibility
       )
     );
 
@@ -985,7 +986,7 @@ if ($conf['picture_menu'] AND (!isset($themeconf['hide_menu_on']) OR !in_array('
 {
   if (!isset($page['start'])) $page['start'] = 0;
   include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
-  if (is_admin()) $template->assign('U_ADMIN', $url_admin); // overwrited by the menu
+  if (is_admin()) $template->assign('U_ADMIN', $url_admin); // overwrited by the menu TEMP 2.5 for backward compatibility
 }
 
 include(PHPWG_ROOT_PATH.'include/page_header.php');
diff --git a/themes/default/template/picture.tpl b/themes/default/template/picture.tpl
index 3faa4ffba..5bf59be96 100644
--- a/themes/default/template/picture.tpl
+++ b/themes/default/template/picture.tpl
@@ -87,8 +87,8 @@ jQuery("#derivativeSwitchBox").on("mouseleave click", function() {
 		<span class="pwg-icon pwg-icon-representative"> </span><span class="pwg-button-text">{'representative'|@translate}</span>
 	</a>
 {/if}{/strip}
-{strip}{if isset($U_ADMIN)}
-	<a href="{$U_ADMIN}" title="{'Modify information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
+{strip}{if isset($U_PHOTO_ADMIN)}
+	<a href="{$U_PHOTO_ADMIN}" title="{'Modify information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow">
 		<span class="pwg-icon pwg-icon-edit"> </span><span class="pwg-button-text">{'Edit'|@translate}</span>
 	</a>
 {/if}{/strip}
-- 
cgit v1.2.3