[phpwiki-checkins] SF.net SVN: phpwiki:[10504] trunk

[<var...@us...>]

Revision: 10504
          http://sourceforge.net/p/phpwiki/code/10504
Author:   vargenau
Date:     2021-08-13 08:15:18 +0000 (Fri, 13 Aug 2021)
Log Message:
-----------
DBADMIN_USER and DBADMIN_PASSWD are no longer needed for upgrade

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/doc/INSTALL.mysql
    trunk/lib/IniConfig.php

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/config/config-default.ini	2021-08-13 08:15:18 UTC (rev 10504)
@@ -150,8 +150,6 @@
 DISABLE_GETIMAGESIZE = true
 ; FORTUNE_DIR = /usr/share/fortune
 ; GOOGLE_LICENSE_KEY = "..."
-; DBADMIN_USER =
-; DBADMIN_PASSWD =
 BLOG_DEFAULT_EMPTY_PREFIX = true
 ; TOOLBAR_PAGELINK_PULLDOWN = *
 ; TOOLBAR_TEMPLATE_PULLDOWN = Template*

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/config/config-dist.ini	2021-08-13 08:15:18 UTC (rev 10504)
@@ -473,15 +473,6 @@
 ; to set this parameter to 0 (disabled).
 ;DATABASE_OPTIMISE_FREQUENCY = 50
 
-; Optional: Administrative SQL DB access (for action=upgrade)
-; If action=upgrade detects (My)SQL problems, but has no ALTER permissions,
-; give here a database username which has the necessary ALTER or CREATE permissions.
-; Of course you can fix your database manually. See lib/upgrade.php for known issues.
-;DBADMIN_USER = root
-
-; Optional: Administrative SQL DB access (for action=upgrade)
-;DBADMIN_PASSWD = secret
-
 ; Store DB query results (esp. for page lists) in memory to avoid duplicate queries.
 ; Disable only for old php's with low memory or memory_limit=8MB.
 ; Requires at least memory_limit=16MB

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/configurator.php	2021-08-13 08:15:18 UTC (rev 10504)
@@ -809,12 +809,6 @@
 $properties["DATABASE_OPTIMISE_FREQUENCY"] =
     new numeric_define_optional('DATABASE_OPTIMISE_FREQUENCY', DATABASE_OPTIMISE_FREQUENCY);
 
-$properties["DBADMIN_USER"] =
-    new _define_optional('DBADMIN_USER', DBADMIN_USER);
-
-$properties["DBADMIN_PASSWD"] =
-    new _define_password_optional('DBADMIN_PASSWD', DBADMIN_PASSWD);
-
 $properties["USECACHE"] =
     new boolean_define_commented_optional('USECACHE');
 

Modified: trunk/doc/INSTALL.mysql
===================================================================
--- trunk/doc/INSTALL.mysql	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/doc/INSTALL.mysql	2021-08-13 08:15:18 UTC (rev 10504)
@@ -62,18 +62,4 @@
 "mysql.php" gets included:
 if (!extension_loaded("mysql"))  { dl("mysql.so"); }
 
-
-Upgrading a MySQL phpwiki
--------------------------
-
-If schemas/mysql-initialize.sql has changed for your old phpwiki
-installation (or changed when compared to the old "mysql.sql" file),
-you can either create missing tables manually and ALTER the changed
-tables manually.
-Or you can run ?action=upgrade (also from "Upgrade"
-at PhpWikiAdministration), but then your database user needs the
-necessary ALTER and CREATE permissions.
-You might want to set DBADMIN_USER temporarily in your config.ini.
-?action=upgrade also brings all changed pgsrc files up-to-date.
-
 /Reini Urban and Arno aho...@ma...

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-08-12 12:53:41 UTC (rev 10503)
+++ trunk/lib/IniConfig.php	2021-08-13 08:15:18 UTC (rev 10504)
@@ -180,7 +180,7 @@
         'IMAP_AUTH_HOST', 'POP3_AUTH_HOST',
         'AUTH_USER_FILE', 'AUTH_GROUP_FILE', 'AUTH_SESS_USER', 'AUTH_SESS_LEVEL',
         'GOOGLE_LICENSE_KEY', 'FORTUNE_DIR',
-        'DISABLE_GETIMAGESIZE', 'DBADMIN_USER', 'DBADMIN_PASSWD',
+        'DISABLE_GETIMAGESIZE',
         'SESSION_SAVE_PATH',
         'TOOLBAR_PAGELINK_PULLDOWN', 'TOOLBAR_TEMPLATE_PULLDOWN', 'TOOLBAR_IMAGE_PULLDOWN',
         'EXTERNAL_LINK_TARGET', 'ACCESS_LOG_SQL', 'USE_EXTERNAL_HTML2PDF',

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.