Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

This commit is contained in:
lorilee
2010-07-26 13:44:30 -07:00
164 changed files with 70695 additions and 65467 deletions

View File

@@ -49,8 +49,6 @@ if (! defined('PHPMYADMIN')) {
/**
* for PMA_setHistory()
*/
require_once './libraries/relation.lib.php';
if (! PMA_isValid($_REQUEST['no_history']) && empty($GLOBALS['error_message'])
&& ! empty($GLOBALS['sql_query'])) {
PMA_setHistory(PMA_ifSetOr($GLOBALS['db'], ''),