Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorMichal Čihař <mcihar@suse.cz>2013-08-07 12:58:17 +0400
committerMichal Čihař <mcihar@suse.cz>2013-08-07 12:58:17 +0400
commit0a3d1d5be80a93d24e40b3e90c5b6491da1141fd (patch)
tree7d9eeaa3eac1d68decea74702b708df4d35372c3 /setup
parentffae07abda9cc3538c4ae137466595c633c1a21f (diff)
Better names for URL generating functions
Diffstat (limited to 'setup')
-rw-r--r--setup/frames/index.inc.php4
-rw-r--r--setup/frames/menu.inc.php2
-rw-r--r--setup/lib/form_processing.lib.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 26c7b08332..8b5718628f 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -22,7 +22,7 @@ $all_languages = PMA_langList();
uasort($all_languages, 'PMA_languageCmp');
$cf = ConfigFile::getInstance();
-$separator = PMA_get_arg_separator('html');
+$separator = PMA_URL_getArgSeparator('html');
// message handling
messages_begin();
@@ -70,7 +70,7 @@ if (!$is_https) {
?>
<form id="select_lang" method="post" action="<?php echo htmlspecialchars($_SERVER['REQUEST_URI']) ?>">
- <?php echo PMA_generate_common_hidden_inputs() ?>
+ <?php echo PMA_URL_getHiddenInputs() ?>
<bdo lang="en" dir="ltr"><label for="lang">
<?php echo __('Language') . (__('Language') != 'Language' ? ' - Language' : '') ?>
</label></bdo><br />
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index 69563a243b..35011d4807 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -10,7 +10,7 @@ if (!defined('PHPMYADMIN')) {
exit;
}
-$separator = PMA_get_arg_separator('html');
+$separator = PMA_URL_getArgSeparator('html');
?>
<ul>
<li><a href="index.php"><?php echo __('Overview') ?></a></li>
diff --git a/setup/lib/form_processing.lib.php b/setup/lib/form_processing.lib.php
index 65ebb1db2e..082c28675b 100644
--- a/setup/lib/form_processing.lib.php
+++ b/setup/lib/form_processing.lib.php
@@ -33,7 +33,7 @@ function process_formset(FormDisplay $form_display)
// check for form errors
if ($form_display->hasErrors()) {
// form has errors, show warning
- $separator = PMA_get_arg_separator('html');
+ $separator = PMA_URL_getArgSeparator('html');
$page = filter_input(INPUT_GET, 'page');
$formset = filter_input(INPUT_GET, 'formset');
$formset = $formset ? "{$separator}formset=$formset" : '';