mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-09 02:06:32 +02:00
ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -693,7 +693,7 @@ else
|
||||
|
||||
<p><?php echo ((isset($lang['INLINE_UPDATE_SUCCESSFUL'])) ? $lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p>
|
||||
|
||||
<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&sub=file_check&lang=$language"); ?>">» <?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
|
||||
<p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&sub=file_check&lang=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p>
|
||||
|
||||
<?php
|
||||
}
|
||||
|
@@ -63,7 +63,7 @@ class install_install extends module
|
||||
$template->assign_vars(array(
|
||||
'TITLE' => $lang['INSTALL_INTRO'],
|
||||
'BODY' => $lang['INSTALL_INTRO_BODY'],
|
||||
'L_SUBMIT' => $lang['NEXT'],
|
||||
'L_SUBMIT' => $lang['NEXT_STEP'],
|
||||
'S_LANG_SELECT' => '<select id="language" name="language">' . $this->p_master->inst_language_select($language) . '</select>',
|
||||
'U_ACTION' => $this->p_master->module_url . "?mode=$mode&sub=requirements&language=$language",
|
||||
));
|
||||
|
@@ -108,6 +108,9 @@ class install_update extends module
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
// Force template recompile
|
||||
$config['load_tplcompile'] = 1;
|
||||
|
||||
// First of all, init the user session
|
||||
$user->session_begin();
|
||||
$auth->acl($user->data);
|
||||
|
Reference in New Issue
Block a user