Merge remote-tracking branch 'origin/master'

2015-11-02 10:52:53 +01:00 · 2015-11-02 10:52:53 +01:00 · e480bf2134
commit e480bf2134
parent ff55eac7cd ce6acede18
1 changed files with 1 additions and 1 deletions
--- a/libraries/DatabaseInterface.php
+++ b/libraries/DatabaseInterface.php
@ -485,7 +485,7 @@ class DatabaseInterface

        $tables = array();

-        if (! isset($GLOBALS['cfg']['Server']['DisableIS']) || !$GLOBALS['cfg']['Server']['DisableIS']) {
+        if (! $GLOBALS['cfg']['Server']['DisableIS']) {
            $sql_where_table = $this->_getTableCondition(
                $table, $tbl_is_group, $table_type
            );