gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused parameter $base_dir

Browse Source
This commit is contained in:
Michal Čihař 2012-05-09 11:34:02 +02:00
parent fe48cd531d
commit 9ab1189b29
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/common.lib.php
View File

@ -1702,13 +1702,12 @@ function PMA_localisedDate($timestamp = -1, $format = '')
*
* @param array $tab array with all options
* @param array $url_params
* @param string $base_dir
*
* @return string html code for one tab, a link if valid otherwise a span
*
* @access public
*/
function PMA_generate_html_tab($tab, $url_params = array(), $base_dir = '')
function PMA_generate_html_tab($tab, $url_params = array())
{
// default values
$defaults = array(
@ -1806,20 +1805,17 @@ function PMA_generate_html_tab($tab, $url_params = array(), $base_dir = '')
*
* @param array $tabs one element per tab
* @param string $url_params
* @param string $base_dir
* @param string $menu_id
*
* @return string html-code for tab-navigation
*/
function PMA_generate_html_tabs($tabs, $url_params, $base_dir = '',
$menu_id = 'topmenu'
) {
function PMA_generate_html_tabs($tabs, $url_params, $menu_id = 'topmenu') {
$tab_navigation = '<div id="' . htmlentities($menu_id)
. 'container" class="menucontainer">'
.'<ul id="' . htmlentities($menu_id) . '">';
foreach ($tabs as $tab) {
$tab_navigation .= PMA_generate_html_tab($tab, $url_params, $base_dir);
$tab_navigation .= PMA_generate_html_tab($tab, $url_params);
}
$tab_navigation .=

2
tbl_select.php
View File

@ -89,7 +89,7 @@ $url_params = array();
$url_params['db'] = $db;
$url_params['table'] = $table;
echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, 'topmenu2');
?>

2
tbl_zoom_select.php
View File

@ -175,7 +175,7 @@ if (! isset($zoom_submit) && ! isset($inputs)) {
$url_params = array();
$url_params['db'] = $db;
$url_params['table'] = $table;
echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, '', 'topmenu2');
echo PMA_generate_html_tabs(PMA_tbl_getSubTabs(), $url_params, 'topmenu2');
/**
* Set the field name,type,collation and whether null on select of a coulmn

2
test/theme.php
View File

@ -143,7 +143,7 @@ $tabs['import']['link'] = 'server_import.php';
$tabs['import']['text'] = 'active';
$tabs['import']['class'] = 'active';
echo PMA_generate_html_tabs($tabs, array(), '../../../../');
echo PMA_generate_html_tabs($tabs, array());
unset($tabs);
if (@file_exists($pmaThemeImage . 'logo_right.png')) {