mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 05:50:42 +02:00
some changes/fixes
git-svn-id: file:///svn/phpbb/trunk@6345 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -306,13 +306,14 @@ class module
|
||||
}
|
||||
|
||||
define('HEADER_INC', true);
|
||||
global $template, $lang, $stage;
|
||||
global $template, $lang, $stage, $phpbb_root_path;
|
||||
|
||||
$template->assign_vars(array(
|
||||
'L_CHANGE' => $lang['CHANGE'],
|
||||
'L_INSTALL_PANEL' => $lang['INSTALL_PANEL'],
|
||||
'L_SELECT_LANG' => $lang['SELECT_LANG'],
|
||||
'PAGE_TITLE' => $this->get_page_title(),
|
||||
'T_IMAGE_PATH' => $phpbb_root_path . 'adm/images/',
|
||||
|
||||
'S_CONTENT_DIRECTION' => $lang['DIRECTION'],
|
||||
'S_CONTENT_ENCODING' => $lang['ENCODING'],
|
||||
|
@@ -20,9 +20,7 @@ if ( !defined('IN_INSTALL') )
|
||||
if (!empty($setmodules))
|
||||
{
|
||||
/* If phpBB is already installed we do not include this module
|
||||
// This does not work at the moment because on installation the config file will be written before
|
||||
// everything is finished.
|
||||
if (@file_exists($phpbb_root_path . 'config.' . $phpEx))
|
||||
if (@file_exists($phpbb_root_path . 'config.' . $phpEx) && !file_exists($phpbb_root_path . 'cache/install_lock'))
|
||||
{
|
||||
include_once($phpbb_root_path . 'config.' . $phpEx);
|
||||
|
||||
|
Reference in New Issue
Block a user