mirror of
https://github.com/phpbb/phpbb.git
synced 2025-04-20 07:42:09 +02:00
Merge PR #1039 branch 'p/ticket/11154' into develop
* p/ticket/11154: [ticket/11154] Do not try to load any extensions when installing.
This commit is contained in:
commit
fc41b52cea
@ -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']);
|
||||
|
Loading…
x
Reference in New Issue
Block a user