partial merge -r1173:1174 from branch-1_6 to trunk: new configuration

parameter die_on_sql_error (upgrade.php and install/upgrade_*.php not
concerned on BSF)

partial merge -r1208:1209 from branch-1_6 to trunk (only bug fix on
incorrect insertion of complex upgrade identifiers)

deletions: upgrade.php and all install/upgrade_*.php because these script
are never up to date on BSF. Anyway, they are only required on a stable
branch.


git-svn-id: http://piwigo.org/svn/trunk@1221 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2006-04-20 19:31:12 +00:00
commit c64da384ea
7 changed files with 31 additions and 870 deletions

View file

@ -1,45 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<title>PhpWebGallery : Upgrade to {RELEASE}</title>
</head>
<body>
<!-- BEGIN choices -->
<h1>Welcome to PhpWebGallery upgrade page.</h1>
<p>This page proposes to upgrade your database corresponding to your old version
of PhpWebGallery to the current version. Select the version you wish to upgrade
:</p>
<ul>
<!-- BEGIN choice -->
<li><a href="{choices.choice.URL}">{choices.choice.VERSION}</a></li>
<!-- END choice -->
</ul>
<!-- END choices -->
<!-- BEGIN upgrade -->
<h1>Upgrade from version {upgrade.VERSION} to {RELEASE}</h1>
<p>Statistics</p>
<ul>
<li>total upgrade time : {upgrade.TOTAL_TIME}</li>
<li>total SQL time : {upgrade.SQL_TIME}</li>
<li>SQL queries : {upgrade.NB_QUERIES}</li>
</ul>
<!-- BEGIN infos -->
<p>Upgrade informations</p>
<ul>
<!-- BEGIN info -->
<li>{upgrade.infos.info.CONTENT}</li>
<!-- END info -->
</ul>
<!-- END infos -->
<!-- END upgrade -->
</body>
</html>