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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-08-26 18:45:09 +02:00
commit 2fcba195ec
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libraries/url_generating.lib.php
View File

@ -167,19 +167,25 @@ function PMA_getHiddenFields($values, $pre = '')
* // script.php?server=1&lang=en
* </code>
*
* @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 mixed $params_or_db Contains either an associative 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: '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 $encode_or_table 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 '?'
* - if first param is not array: optional character to use
* instead of '&amp;' for dividing URL parameters
* @param string $divider If first param is array: optional character
* to use instead of '?';
* If first param is not array: optional
* character to use instead of '&amp;' for
* dividing URL parameters
*
* @return string string with URL parameters
* @access public