From 4021dc840d2d940e7832f89587b247d4d7ba4d75 Mon Sep 17 00:00:00 2001 From: rurban Date: Fri, 14 May 2004 11:33:03 +0000 Subject: [PATCH] version updated to 1.3.11pre upgrade stability fix git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3504 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- doc/HISTORY | 3 ++- lib/WikiDB/adodb/adodb.inc.php | 4 ++-- lib/prepend.php | 4 ++-- lib/upgrade.php | 17 +++++++++++++---- pgsrc/ReleaseNotes | 7 ++++--- 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/doc/HISTORY b/doc/HISTORY index 558d95ccc..806bfa114 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -57,6 +57,7 @@ new: * added chinese language support, by Yan-ren Tsai (druryl) * added missing MacOSX buttons, by Carsten Klapp. * new Crao theme from http://wiki.crao.net, by Arnaud Fontaine and Laurent Lunati +* extended PhpWiki:InlineImages markup (size, border, ...) 1.3.9-p1 May,5 2004, Reini Urban: @@ -483,4 +484,4 @@ URL's. Prior to 0.02, there were no numbered releases, and in fact there was only one release, so I guess that would be 0.01 :-) -$Id: HISTORY,v 1.8 2004-05-13 13:48:34 rurban Exp $ +$Id: HISTORY,v 1.9 2004-05-14 11:32:51 rurban Exp $ diff --git a/lib/WikiDB/adodb/adodb.inc.php b/lib/WikiDB/adodb/adodb.inc.php index bfcb2ed6a..71850cded 100644 --- a/lib/WikiDB/adodb/adodb.inc.php +++ b/lib/WikiDB/adodb/adodb.inc.php @@ -1940,7 +1940,7 @@ $retarr = array(); while (!$rs->EOF) { //print_r($rs->fields); $fld =& new ADOFieldObject(); - $fld->name = $rs->fields[0]; + $fld->name = $upper ? strtoupper($rs->fields[0]) : $rs->fields[0]; $fld->type = $rs->fields[1]; if (isset($rs->fields[3]) && $rs->fields[3]) { if ($rs->fields[3]>0) $fld->max_length = $rs->fields[3]; @@ -1950,7 +1950,7 @@ $fld->max_length = $rs->fields[2]; if ($ADODB_FETCH_MODE == ADODB_FETCH_NUM) $retarr[] = $fld; - else $retarr[strtoupper($fld->name)] = $fld; + else $retarr[$fld->name] = $fld; $rs->MoveNext(); } $rs->Close(); diff --git a/lib/prepend.php b/lib/prepend.php index b999ba9b5..1336d2619 100644 --- a/lib/prepend.php +++ b/lib/prepend.php @@ -5,9 +5,9 @@ */ $RCS_IDS = ''; function rcs_id ($id) { $GLOBALS['RCS_IDS'] .= "$id\n"; } -rcs_id('$Id: prepend.php,v 1.19 2004-05-12 19:27:48 rurban Exp $'); +rcs_id('$Id: prepend.php,v 1.20 2004-05-14 11:32:52 rurban Exp $'); -define ('PHPWIKI_VERSION', '1.3.10'); +define ('PHPWIKI_VERSION', '1.3.11pre'); // If your php was compiled with --enable-trans-sid it tries to // add a PHPSESSID query argument to all URL strings when cookie diff --git a/lib/upgrade.php b/lib/upgrade.php index 79ca2e473..6d07f9a1e 100644 --- a/lib/upgrade.php +++ b/lib/upgrade.php @@ -1,5 +1,5 @@ _backend->listOfFields($database,$session_tbl); - if (!in_array("sess_ip",$sess_fields)) { + //FIXME: adodb seem to uppercase the fields + if (!strstr(strtolower(join(':',$sess_fields)),"sess_ip")) { echo "",_("ADDING"),""," ... "; $dbh->simpleQuery("ALTER TABLE $session_tbl ADD sess_ip CHAR(15) NOT NULL"); } else { @@ -271,13 +272,14 @@ function CheckDatabaseUpdate($request) { for ($i = 0; $i < $columns; $i++) { if (mysql_field_name($fields, $i) == 'id') { $flags = mysql_field_flags($fields, $i); - if (!strstr($flags,"auto_increment")) { + //FIXME: something wrong with ADODB here! + if (!strstr(strtolower($flags),"auto_increment")) { echo "",_("ADDING"),""," ... "; // MODIFY col_def valid since mysql 3.22.16, // older mysql's need CHANGE old_col col_def $dbh->simpleQuery("ALTER TABLE $page_tbl CHANGE id id INT NOT NULL AUTO_INCREMENT"); $fields = mysql_list_fields($database,$page_tbl); - if (!strstr(mysql_field_flags($fields, $i),"auto_increment")) + if (!strstr(strtolower(mysql_field_flags($fields, $i)),"auto_increment")) echo " ",_("FAILED"),"
\n"; else echo _("OK"),"
\n"; @@ -330,6 +332,13 @@ function DoUpgrade($request) { /** $Log: not supported by cvs2svn $ + Revision 1.8 2004/05/12 10:49:55 rurban + require_once fix for those libs which are loaded before FileFinder and + its automatic include_path fix, and where require_once doesn't grok + dirname(__FILE__) != './lib' + upgrade fix with PearDB + navbar.tmpl: remove spaces for IE   button alignment + Revision 1.7 2004/05/06 17:30:38 rurban CategoryGroup: oops, dos2unix eol improved phpwiki_version: diff --git a/pgsrc/ReleaseNotes b/pgsrc/ReleaseNotes index 0be12ff68..8e4b861a8 100644 --- a/pgsrc/ReleaseNotes +++ b/pgsrc/ReleaseNotes @@ -1,9 +1,9 @@ Date: Fri, 29 Apr 2004 17:28:55 -0500 Mime-Version: 1.0 (Produced by PhpWiki 1.3.10) -X-Rcs-Id: $Id: ReleaseNotes,v 1.29 2004-05-13 13:48:34 rurban Exp $ +X-Rcs-Id: $Id: ReleaseNotes,v 1.30 2004-05-14 11:33:03 rurban Exp $ Content-Type: application/x-phpwiki; pagename=ReleaseNotes; - pgsrc_version="2 $Revision: 1.29 $"; + pgsrc_version="2 $Revision: 1.30 $"; flags=PAGE_LOCKED; markup=2; charset=iso-8859-1 @@ -53,7 +53,7 @@ changes: and overwrites ReleaseNotes * PageChangeNotification changed subject to "[WikiName] Page change %s", update your filters accordingly -* action=upgrade now linked in PhpWikiAdministration, +* action=upgrade now linked in PhpWikiAdministration, db: fix page.id auto_increment and ADD session.sess_ip * some internal InlineParser optimization * DBAuthParam statement syntax change: variables now like '$userid' @@ -68,6 +68,7 @@ new: * added chinese language support, by Yan-ren Tsai (druryl) * added missing MacOSX buttons, by Carsten Klapp. * new Crao theme from http://wiki.crao.net, by Arnaud Fontaine and Laurent Lunati +* extended PhpWiki:InlineImages markup (size, border, ...) 1.3.9-p1 May,5 2004, Reini Urban: -- 2.45.0