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-04-07 18:48:00 +02:00
commit 45fb5eecf3
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
db_structure.php
View File

@ -25,7 +25,8 @@ if ($GLOBALS['is_ajax_request'] && ! empty($_REQUEST['favorite_table'])) {
// Request for Synchronization of favorite tables.
if (isset($_REQUEST['sync_favorite_tables'])) {
if (empty($fav_instance->tables)
&& isset($favorite_tables[$user])) {
&& isset($favorite_tables[$user])
) {
foreach ($favorite_tables[$user] as $key => $value) {
$fav_instance->add($value['db'], $value['table']);
}
@ -96,7 +97,9 @@ if ($GLOBALS['is_ajax_request'] && ! empty($_REQUEST['favorite_table'])) {
);
$ajax_response->addJSON(
'anchor',
PMA_getHtmlForFavoriteAnchor($db, array('TABLE_NAME' => $favorite_table), $titles)
PMA_getHtmlForFavoriteAnchor(
$db, array('TABLE_NAME' => $favorite_table), $titles
)
);
} else {
$ajax_response->addJSON(

3
libraries/url_generating.lib.php
View File

@ -279,7 +279,8 @@ function PMA_URL_getArgSeparator($encode = 'none')
if (null === $separator) {
// use separators defined by php, but prefer ';'
// as recommended by W3C
// (see http://www.w3.org/TR/1999/REC-html401-19991224/appendix/notes.html#h-B.2.2)
// (see http://www.w3.org/TR/1999/REC-html401-19991224/appendix
// /notes.html#h-B.2.2)
$arg_separator = ini_get('arg_separator.input');
if (strpos($arg_separator, ';') !== false) {
$separator = ';';