1
0
mirror of https://github.com/vichan-devel/vichan.git synced 2024-11-25 16:00:22 +01:00

Merge ../pl

Conflicts:
	install.php
This commit is contained in:
czaks 2014-05-10 22:06:22 +02:00
commit 246336655a

View File

@ -522,6 +522,7 @@ if (file_exists($config['has_installed'])) {
if (!$twig) load_twig(); if (!$twig) load_twig();
$twig->clearCacheFiles(); $twig->clearCacheFiles();
case '4.4.98': case '4.4.98':
case '4.5.0':
if (!isset($_GET['confirm3'])) { if (!isset($_GET['confirm3'])) {
$page['title'] = 'Breaking change'; $page['title'] = 'Breaking change';
$page['body'] = '<p style="text-align:center">You are upgrading to the 5.0 branch of vichan. Please back up your database, because the process is irreversible. At the current time, if you want a very stable vichan experience, please use the 4.5 branch. This warning will be lifted as soon as we all agree that 5.0 branch is stable enough</p> $page['body'] = '<p style="text-align:center">You are upgrading to the 5.0 branch of vichan. Please back up your database, because the process is irreversible. At the current time, if you want a very stable vichan experience, please use the 4.5 branch. This warning will be lifted as soon as we all agree that 5.0 branch is stable enough</p>
@ -529,7 +530,7 @@ if (file_exists($config['has_installed'])) {
<a href="?confirm3=1">I have read and understood the warning. Proceed to upgrading.</a> <a href="?confirm3=1">I have read and understood the warning. Proceed to upgrading.</a>
</p>'; </p>';
file_write($config['has_installed'], '4.4.98'); file_write($config['has_installed'], '4.5.0');
break; break;
} }