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

fixed endless cycle (introduced by Revision: 10178)

Browse Source
This commit is contained in:
Sebastian Mendel
2007-03-22 15:44:32 +00:00
parent e436bafad6
commit 2fe8c36bd7
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libraries/relation.lib.php
View File

@@ -25,19 +25,13 @@ require_once './libraries/Table.class.php';
*/ */
function PMA_query_as_cu($sql, $show_error = true, $options = 0) function PMA_query_as_cu($sql, $show_error = true, $options = 0)
{ {
$cfgRelation = PMA_getRelationsParam();
if (! strlen($cfgRelation['db'])) {
return false;
}
// Comparing resource ids works on PHP 5 because, when no controluser // Comparing resource ids works on PHP 5 because, when no controluser
// is defined, connecting with the same user for controllink does // is defined, connecting with the same user for controllink does
// not create a new connection. However a new connection is created // not create a new connection. However a new connection is created
// on PHP 4, so we cannot directly compare resource ids. // on PHP 4, so we cannot directly compare resource ids.
if ($GLOBALS['controllink'] == $GLOBALS['userlink'] || PMA_MYSQL_INT_VERSION < 50000) { if ($GLOBALS['controllink'] == $GLOBALS['userlink'] || PMA_MYSQL_INT_VERSION < 50000) {
PMA_DBI_select_db($cfgRelation['db'], $GLOBALS['controllink']); PMA_DBI_select_db($GLOBALS['cfg']['Server']['pmadb'], $GLOBALS['controllink']);
} }
if ($show_error) { if ($show_error) {
$result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options); $result = PMA_DBI_query($sql, $GLOBALS['controllink'], $options);
@@ -233,6 +227,7 @@ function PMA__getRelationsParam()
return $cfgRelation; return $cfgRelation;
} }
$cfgRelation['user'] = $GLOBALS['cfg']['Server']['user']; $cfgRelation['user'] = $GLOBALS['cfg']['Server']['user'];
$cfgRelation['db'] = $GLOBALS['cfg']['Server']['pmadb']; $cfgRelation['db'] = $GLOBALS['cfg']['Server']['pmadb'];