- updated to 1.5.3

Changed files:
    mediawiki-mysqlroot.patch -> 1.3
    mediawiki.conf -> 1.3

diff --git a/mediawiki-mysqlroot.patch b/mediawiki-mysqlroot.patch
index 4219da30c824309f73a870720a12ecb8f2682e98..b32a43b2e5b6ca4a87f2a2516d76950c4499cc89 100644 (file)
--- a/mediawiki-mysqlroot.patch
+++ b/mediawiki-mysqlroot.patch
@@ -9,12 +9,23 @@
                $wgDBadminpassword = $conf->RootPW;
                $wgDBprefix = $conf->DBprefix;
                $wgCommandLineMode = true;
-@@ -438,7 +438,7 @@
-               require_once( "maintenance/InitialiseMessages.inc" );
- 
-               $wgTitle = Title::newFromText( "Installation script" );
+--- ./config/index.php~        2005-12-10 21:58:59.000000000 +0200
++++ ./config/index.php 2005-12-10 22:02:03.000000000 +0200
+@@ -480,14 +480,14 @@
+                               see <a href='http://dev.mysql.com/doc/mysql/en/old-client.html'
+                               >http://dev.mysql.com/doc/mysql/en/old-client.html</a> for help.</b></li>\n";
+               }
+-              print "<li>Trying to connect to MySQL on $wgDBserver as root...\n";
 -              $wgDatabase = Database::newFromParams( $wgDBserver, "root", $conf->RootPW, "", 1 );
-+              $wgDatabase = Database::newFromParams( $wgDBserver, $wgDBadminuser, $conf->RootPW, "", 1 );
-               $wgDatabase->ignoreErrors(true);
++              print "<li>Trying to connect to MySQL on $wgDBserver as MySQL root...\n";
++              $wgDatabase = Database::newFromParams( $wgDBserver, "mysql", $conf->RootPW, "", 1 );
  
-               @$myver = mysql_get_server_info( $wgDatabase->mConn );
+               if( $wgDatabase->isOpen() ) {
+                       $myver = mysql_get_server_info( $wgDatabase->mConn );
+                       $wgDatabase->ignoreErrors(true);
+                       $conf->Root = true;
+-                      print "<ul><li>Connected as root (automatic)</li></ul></li>\n";
++                      print "<ul><li>Connected as MySQL root (automatic)</li></ul></li>\n";
+               } else {
+                       print "<ul><li>MySQL error " . ($err = mysql_errno() ) .
+                               ": " . htmlspecialchars( mysql_error() ) . "</li></ul></li>";

diff --git a/mediawiki.conf b/mediawiki.conf
index bc68620b9f2fdb4d27c470cfc44b5f87821228cc..191a5f96549a0d7796e83486307256797f365a0d 100644 (file)
--- a/mediawiki.conf
+++ b/mediawiki.conf
@@ -1,12 +1,24 @@
 # $Id$
 
-Alias /mediawiki        /usr/share/mediawiki
 <Directory /usr/share/mediawiki>
     allow from all
 
-    php_flag register_globals off
-    # php4 -r 'echo E_ALL & ~E_NOTICE;'
-    php_value error_reporting 2039
+    php_flag    register_globals    off
+    php_value   memory_limit        20M
+
+#   for apache2
+#    AcceptPathInfo On
+
+#    <IfModule mod_rewrite.c>
+#        # when using rewrite rules please read first
+#        # http://meta.wikimedia.org/wiki/Rewrite_rules
+#        RewriteEngine on
+#
+#        # do the rewrite (not tested)
+#        RewriteRule ^mediawiki/?(.*)$ /mediawiki/index.php?title=$1 [L,QSA]
+#    </IfModule>
 </Directory>
 
+Alias /mediawiki    /usr/share/mediawiki
+
 # vim: filetype=apache ts=4 sw=4 et