aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2015-02-16 12:57:00 +0000
committerplegall <plg@piwigo.org>2015-02-16 12:57:00 +0000
commit6d452e8c1bad237b4bcdcfdc24003b8413fd0237 (patch)
treef6da29437dd1124d3ebc0968be3d6a8a2ad00405
parent3e8f2b4c345fcc2f1a75ebaebb23f6afa0ef2cec (diff)
merge r30972 from trunk to branch 2.7
bug 3203 fixed: for IE, explicit the url even for staying on the same page git-svn-id: http://piwigo.org/svn/branches/2.7@30973 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/comments.php2
-rw-r--r--admin/include/add_core_tabs.inc.php9
2 files changed, 8 insertions, 3 deletions
diff --git a/admin/comments.php b/admin/comments.php
index 2666cc27b..0f09faf9f 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -98,6 +98,8 @@ $template->assign(
include_once(PHPWG_ROOT_PATH.'admin/include/tabsheet.class.php');
+$my_base_url = get_root_url().'admin.php?page=';
+
$tabsheet = new tabsheet();
$tabsheet->set_id('comments');
$tabsheet->select('');
diff --git a/admin/include/add_core_tabs.inc.php b/admin/include/add_core_tabs.inc.php
index 3b0c70118..28cf1ce9e 100644
--- a/admin/include/add_core_tabs.inc.php
+++ b/admin/include/add_core_tabs.inc.php
@@ -59,15 +59,18 @@ function add_core_tabs($sheets, $tab_id)
break;
case 'comments':
- $sheets[''] = array('caption' => l10n('User comments'), 'url' => '');
+ global $my_base_url;
+ $sheets[''] = array('caption' => l10n('User comments'), 'url' => $my_base_url.'comments');
break;
case 'users':
- $sheets[''] = array('caption' => '<span class="icon-users"> </span>'.l10n('User list'), 'url' => '');
+ global $my_base_url;
+ $sheets[''] = array('caption' => '<span class="icon-users"> </span>'.l10n('User list'), 'url' => $my_base_url.'user_list');
break;
case 'groups':
- $sheets[''] = array('caption' => '<span class="icon-group"> </span>'.l10n('Groups'), 'url' => '');
+ global $my_base_url;
+ $sheets[''] = array('caption' => '<span class="icon-group"> </span>'.l10n('Groups'), 'url' => $my_base_url.'group_list');
break;
case 'configuration':