[phpwiki-checkins] CVS: phpwiki/lib/plugin WikiAdminUtils.php,1.15,1.16

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25996/plugin

Modified Files:
	WikiAdminUtils.php 
Log Message:
verbose arg

Index: WikiAdminUtils.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/WikiAdminUtils.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -2 -b -p -d -r1.15 -r1.16
--- WikiAdminUtils.php	10 Dec 2004 22:33:40 -0000	1.15
+++ WikiAdminUtils.php	13 Dec 2004 14:35:42 -0000	1.16
@@ -182,18 +182,8 @@ extends WikiPlugin
 
         require_once("lib/upgrade.php");
+        $dbh = $request->_dbi;
         _upgrade_db_init($dbh);
 
-  	$database = $dbh->_backend->database();
-        extract($dbh->_backend->_table_names);
-        $fields = $dbh->_backend->listOfFields($database, $page_tbl);
-        if (!strstr(strtolower(join(':', $fields)), "cached_html")) {
-            $backend_type = $dbh->_backend->backendType();
-            if (substr($backend_type,0,5) == 'mysql')
-                $dbh->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html MEDIUMBLOB");
-            else
-                $dbh->genericSqlQuery("ALTER TABLE $page_tbl ADD cached_html BLOB");
-        }
-
-        $count = _convert_cached_html($dbh);
+        $count = _upgrade_cached_html($dbh, false);
 
         if (!$count)