mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 19:54:12 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source 
Conflicts:
	phpBB/language/en/install.php
This commit is contained in:
Marc Alexander
2016-06-19 18:25:16 +02:00
parent 450e5b36b8 c60dbede3e
commit a460aec68c
5 changed files with 55 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/includes/acp/acp_update.php
View File

@@ -63,5 +63,17 @@ class acp_update
'UPDATE_INSTRUCTIONS' => sprintf($user->lang['UPDATE_INSTRUCTIONS'], $update_link),
));
// Incomplete update?
if (phpbb_version_compare($config['version'], PHPBB_VERSION, '<'))
{
$database_update_link = append_sid($phpbb_root_path . 'install/database_update.' . $phpEx);
$template->assign_vars(array(
'S_UPDATE_INCOMPLETE' => true,
'FILES_VERSION' => PHPBB_VERSION,
'INCOMPLETE_INSTRUCTIONS' => $user->lang('UPDATE_INCOMPLETE_EXPLAIN', $database_update_link),
));
}
}
}