iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-03-28 17:42:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@21039 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2013-02-25 21:16:10 +00:00
parent 99214da72d
commit e9dab9db74
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
picture.php
View File

@@ -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');

4
themes/default/template/picture.tpl
View File

@@ -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}