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 2013-12-28 12:37:29 +01:00
commit 34ac6a8baa
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/pmd/move.js
View File

@ -404,7 +404,7 @@ function Line0(x1, y1, x2, y2, color_line)
}
/**
* draws a angualr relation/constraint line
* draws a angular relation/constraint line
*/
function Line2(x1, y1, x2, y2, color_line)
{

2
setup/lib/form_processing.lib.php
View File

@ -40,7 +40,7 @@ function PMA_process_formset(FormDisplay $form_display)
$formset = $formset ? "{$separator}formset=$formset" : '';
$id = filter_input(INPUT_GET, 'id', FILTER_VALIDATE_INT);
if ($id === null && $page == 'servers') {
// we've just added a new server, get it's id
// we've just added a new server, get its id
$id = $form_display->getConfigFile()->getServerCount();
}
$id = $id ? "{$separator}id=$id" : '';

2
test/libraries/PMA_server_privileges_test.php
View File

@ -66,6 +66,8 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
$GLOBALS['cfg']['Confirm'] = "Confirm";
$GLOBALS['cfg']['ShowHint'] = true;
$GLOBALS['cfgRelation'] = array();
$GLOBALS['cfgRelation']['menuswork'] = false;
$GLOBALS['table'] = "table";
$GLOBALS['PMA_PHP_SELF'] = PMA_getenv('PHP_SELF');
$GLOBALS['pmaThemeImage'] = 'image';