Changeset 21039


Ignore:
Timestamp:
02/25/13 22:16:10 (6 years ago)
Author:
rvelices
Message:

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)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/picture.php

    r20609 r21039  
    773773                  array('action'=>'add_to_caddie') 
    774774               ), 
    775       'U_ADMIN' => $url_admin, 
     775      'U_PHOTO_ADMIN' => $url_admin, 
     776      'U_ADMIN' => $url_admin, // TEMP 2.5 for backward compatibility 
    776777      ) 
    777778    ); 
     
    986987  if (!isset($page['start'])) $page['start'] = 0; 
    987988  include( PHPWG_ROOT_PATH.'include/menubar.inc.php'); 
    988   if (is_admin()) $template->assign('U_ADMIN', $url_admin); // overwrited by the menu 
     989  if (is_admin()) $template->assign('U_ADMIN', $url_admin); // overwrited by the menu TEMP 2.5 for backward compatibility 
    989990} 
    990991 
  • trunk/themes/default/template/picture.tpl

    r19581 r21039  
    8888        </a> 
    8989{/if}{/strip} 
    90 {strip}{if isset($U_ADMIN)} 
    91         <a href="{$U_ADMIN}" title="{'Modify information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
     90{strip}{if isset($U_PHOTO_ADMIN)} 
     91        <a href="{$U_PHOTO_ADMIN}" title="{'Modify information'|@translate}" class="pwg-state-default pwg-button" rel="nofollow"> 
    9292                <span class="pwg-icon pwg-icon-edit"> </span><span class="pwg-button-text">{'Edit'|@translate}</span> 
    9393        </a> 
Note: See TracChangeset for help on using the changeset viewer.