Merge remote-tracking branch 'origin/master'

This commit is contained in:
Michal Čihař 2012-03-31 10:08:03 +02:00
commit e297846576

View File

@ -53,7 +53,7 @@ if ($is_select) {
$db = $prev_db;
}
// Nijel: don't change reload, if we already decided to reload in import
if (empty($reload) && empty($GLOBALS['ajax_request'])) {
if (empty($reload) && empty($GLOBALS['is_ajax_request'])) {
$reload = ($db == $prev_db) ? 0 : 1;
}
}