diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-10-13 13:19:43 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-10-13 13:19:43 +0200 |
| commit | 186bc82480bba31127baf012e66a892b6e3108af (patch) | |
| tree | 544484d670e7945c79965ee7133c669984836d1a /phpBB | |
| parent | a885095897054c91ab68b753ce2a86ae74f2f666 (diff) | |
| parent | 2092a8aaca4fed55c089142b3bee55bb88a87e14 (diff) | |
| download | forums-186bc82480bba31127baf012e66a892b6e3108af.tar forums-186bc82480bba31127baf012e66a892b6e3108af.tar.gz forums-186bc82480bba31127baf012e66a892b6e3108af.tar.bz2 forums-186bc82480bba31127baf012e66a892b6e3108af.tar.xz forums-186bc82480bba31127baf012e66a892b6e3108af.zip | |
Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
[feature/request-class] Check for existence of $request
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/db/dbal.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/db/dbal.php b/phpBB/includes/db/dbal.php index 9a0e9f1b55..e0d329abfe 100644 --- a/phpBB/includes/db/dbal.php +++ b/phpBB/includes/db/dbal.php @@ -713,7 +713,7 @@ class dbal global $cache, $starttime, $phpbb_root_path, $user; global $request; - if (!$request->variable('explain', false)) + if (is_object($request) && !$request->variable('explain', false)) { return false; } |