diff options
Diffstat (limited to 'phpBB/includes/acm')
| -rw-r--r-- | phpBB/includes/acm/acm_db.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acm/acm_file.php | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/phpBB/includes/acm/acm_db.php b/phpBB/includes/acm/acm_db.php index 0204666aa4..83f52362cd 100644 --- a/phpBB/includes/acm/acm_db.php +++ b/phpBB/includes/acm/acm_db.php @@ -57,7 +57,7 @@ class acm if (!$var_names) { - $var_requested[] = $row['var_name']; + $this->var_requested[] = $row['var_name']; } } } @@ -137,7 +137,7 @@ class acm if ($var_name{0} == '_') { - if (!in_array($this->var_requested, $var_name)) + if (!in_array($var_name, $this->var_requested)) { $this->var_requested[] = $var_name; diff --git a/phpBB/includes/acm/acm_file.php b/phpBB/includes/acm/acm_file.php index 0df3c05a98..fa430b9247 100644 --- a/phpBB/includes/acm/acm_file.php +++ b/phpBB/includes/acm/acm_file.php @@ -154,6 +154,11 @@ class acm { global $phpEx; + if (!$this->_exists($var_name)) + { + return; + } + if ($var_name == 'sql' && !empty($table)) { $regex = '(' . ((is_array($table)) ? implode('|', $table) : $table) . ')'; |