Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15298/include/admin
Modified Files:
upgrader.inc.php
Log Message:
PLEASE TEST, THIS IS IMPORTANT!
* Fix CSS not visible in upgrader (there must be a cleaner way to do
this, I admit I feel bad with this solution)
* Fix SQL index key creation, the parse_sql regexp didn't catch many
lines. Create those missing SQL keys for alpha10 upgrade
* Upgrader didn't emit SQL error messages
* serendipity_db_query is now able to expect errors (like for this
alpha10 upgrade)
PLEASE TEST, THIS IS IMPORTANT!
Index: upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- upgrader.inc.php 22 Dec 2004 17:44:53 -0000 1.9
+++ upgrader.inc.php 19 Jan 2005 10:22:12 -0000 1.10
@@ -118,6 +118,11 @@
'function' => 'serendipity_installFiles',
'title' => 'Update of .htaccess file',
'desc' => 'In order to implement author views, changes were made to the .htaccess file, you need to regenerate it'),
+
+ array('version' => '0.8-alpha10',
+ 'function' => 'serendipity_installFiles',
+ 'title' => 'Update of .htaccess file',
+ 'desc' => 'In order to implement URL rewrite improvement, changes were made to the .htaccess file, you need to regenerate it'),
);
/* Fetch SQL files which needs to be run */
@@ -150,6 +155,8 @@
} elseif ($serendipity['GET']['action'] == 'upgrade') {
+ $errors = array();
+
/* Install SQL files */
foreach ($sqlfiles as $sqlfile) {
$sql = file_get_contents(S9Y_INCLUDE_PATH .'sql/'. $sqlfile);
@@ -158,14 +165,12 @@
foreach ($res[0] as $sql) {
$r = serendipity_db_schema_import($sql);
if (is_string($r)) {
- $errors[] = $r;
+ $errors[] = trim($r);
}
}
}
-
/* Call functions */
- $errors = array();
foreach ($tasks as $task) {
if (version_compare(serendipity_version($serendipity['versionInstalled']), $task['version'], '<') ) {
if (is_callable($task['function'])) {
|