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

improved calling parameter and explanation

Browse Source
This commit is contained in:
Marc Delisle
2008-10-08 12:14:19 +00:00
parent fd03f05f4d
commit f2c9af09e3
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/common.inc.php
View File

@@ -539,7 +539,7 @@ if ($_SESSION['PMA_Config']->get('ForceSSL')
PMA_sendHeaderLocation(
preg_replace('/^http/', 'https',
$_SESSION['PMA_Config']->get('PmaAbsoluteUri'))
. PMA_generate_common_url($_GET, '&'));
. PMA_generate_common_url($_GET, 'text'));
exit;
}

16
libraries/url_generating.lib.php
View File

@@ -183,13 +183,17 @@ function PMA_getHiddenFields($values, $pre = '')
* @uses implode()
* @param mixed assoc. array with url params or optional string with database name
* if first param is an array there is also an ? prefixed to the url
* @param string if first param is array: optional character to use
* instead of '&' for dividing URL parameters
* else, optional table name
* @param string if first param is array: optional character to
*
* @param string - if first param is array: 'html' to use htmlspecialchars()
* on the resulting URL (for a normal URL displayed in HTML)
* or something else to avoid using htmlspecialchars() (for
* a URL sent via a header); if not set,'html' is assumed
* - if first param is not array: optional table name
*
* @param string - if first param is array: optional character to
* use instead of '?'
* else, optional character to use instead of '&'
* for dividing URL parameters
* - if first param is not array: optional character to use
* instead of '&' for dividing URL parameters
* @return string string with URL parameters
* @access public
* @author nijel