Changeset 30973


Ignore:
Timestamp:
02/16/15 13:57:00 (4 years ago)
Author:
plg
Message:

merge r30972 from trunk to branch 2.7

bug 3203 fixed: for IE, explicit the url even for staying on the same page

Location:
branches/2.7/admin
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.7/admin/comments.php

    r29060 r30973  
    9898 
    9999include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php'); 
     100 
     101$my_base_url = get_root_url().'admin.php?page='; 
    100102 
    101103$tabsheet = new tabsheet(); 
  • branches/2.7/admin/include/add_core_tabs.inc.php

    r28714 r30973  
    6060 
    6161    case 'comments': 
    62       $sheets[''] = array('caption' => l10n('User comments'), 'url' => ''); 
     62      global $my_base_url; 
     63      $sheets[''] = array('caption' => l10n('User comments'), 'url' => $my_base_url.'comments'); 
    6364      break; 
    6465 
    6566    case 'users': 
    66       $sheets[''] = array('caption' => '<span class="icon-users"> </span>'.l10n('User list'), 'url' => ''); 
     67      global $my_base_url; 
     68      $sheets[''] = array('caption' => '<span class="icon-users"> </span>'.l10n('User list'), 'url' => $my_base_url.'user_list'); 
    6769      break; 
    6870 
    6971    case 'groups': 
    70       $sheets[''] = array('caption' => '<span class="icon-group"> </span>'.l10n('Groups'), 'url' => ''); 
     72      global $my_base_url; 
     73      $sheets[''] = array('caption' => '<span class="icon-group"> </span>'.l10n('Groups'), 'url' => $my_base_url.'group_list'); 
    7174      break; 
    7275 
Note: See TracChangeset for help on using the changeset viewer.