makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge PR #1039 branch 'p/ticket/11154' into develop

Browse source 
* p/ticket/11154:
  [ticket/11154] Do not try to load any extensions when installing.
This commit is contained in:
Oleg Pudeyev 2012-11-07 19:49:12 -05:00
commit fc41b52cea
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/extension/manager.php
View file

@ -67,6 +67,17 @@ class phpbb_extension_manager
*/ */
public function load_extensions() 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 * $sql = 'SELECT *
FROM ' . $this->extension_table; FROM ' . $this->extension_table;
@ -74,7 +85,6 @@ class phpbb_extension_manager
$extensions = $this->db->sql_fetchrowset($result); $extensions = $this->db->sql_fetchrowset($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$this->extensions = array();
foreach ($extensions as $extension) foreach ($extensions as $extension)
{ {
$extension['ext_path'] = $this->get_extension_path($extension['ext_name']); $extension['ext_path'] = $this->get_extension_path($extension['ext_name']);