diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-07 19:49:12 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-07 19:49:12 -0500 |
| commit | fc41b52cea379835b12950d4bdef2ca5c0d11246 (patch) | |
| tree | d977b6324bb183d33892879a35a9a0706808e664 | |
| parent | ee29cc1678d4aa99c5ea91c5bf3f9499c335ef43 (diff) | |
| parent | 2400a300273e76f0af9189fdbfa7a5e3e04360e7 (diff) | |
| download | forums-fc41b52cea379835b12950d4bdef2ca5c0d11246.tar forums-fc41b52cea379835b12950d4bdef2ca5c0d11246.tar.gz forums-fc41b52cea379835b12950d4bdef2ca5c0d11246.tar.bz2 forums-fc41b52cea379835b12950d4bdef2ca5c0d11246.tar.xz forums-fc41b52cea379835b12950d4bdef2ca5c0d11246.zip | |
Merge PR #1039 branch 'p/ticket/11154' into develop
* p/ticket/11154:
[ticket/11154] Do not try to load any extensions when installing.
| -rw-r--r-- | phpBB/includes/extension/manager.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/includes/extension/manager.php b/phpBB/includes/extension/manager.php index 9a518c215f..cfa6a0e000 100644 --- a/phpBB/includes/extension/manager.php +++ b/phpBB/includes/extension/manager.php @@ -67,6 +67,17 @@ class phpbb_extension_manager */ public function load_extensions() { + $this->extensions = array(); + + // Do not try to load any extensions when installing or updating + // Note: database updater invokes this code, and in 3.0 + // there is no extension table therefore the rest of this function + // fails + if (defined('IN_INSTALL')) + { + return; + } + $sql = 'SELECT * FROM ' . $this->extension_table; @@ -74,7 +85,6 @@ class phpbb_extension_manager $extensions = $this->db->sql_fetchrowset($result); $this->db->sql_freeresult($result); - $this->extensions = array(); foreach ($extensions as $extension) { $extension['ext_path'] = $this->get_extension_path($extension['ext_name']); |