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

Fix merge conflicts

Browse Source
This commit is contained in:
Marc Delisle 2011-09-29 07:12:57 -04:00
parent 86138fa914
commit 963f478fdd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/schema/User_Schema.class.php
View File

@ -84,10 +84,10 @@ class PMA_User_Schema
break;
case 'delete_old_references':
$this->_deleteTableRows(
$delrow,
$_POST['delrow'],
$cfgRelation,
$db,
$this->chosenPage
$_POST['chpage']
);
break;
case 'process_export':
@ -352,7 +352,9 @@ class PMA_User_Schema
echo "\n" . '</form>' . "\n\n";
} // end if
$this->_deleteTables($db, $this->chosenPage, $tabExist);
if (isset($tabExist)) {
$this->_deleteTables($db, $this->chosenPage, $tabExist);
}
}
/**