[evolvis-commits] r18301: Update debian_specific_config.patch: Don't redefine MW_INSTALL_PATH in config/index.php, remove the original definition

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Apr 11 11:16:21 CEST 2012


Author: mirabilos
Date: 2012-04-11 11:16:21 +0200 (Wed, 11 Apr 2012)
New Revision: 18301

Modified:
   trunk/mediawiki/debian/changelog
   trunk/mediawiki/debian/patches/debian_specific_config.patch
Log:
Update debian_specific_config.patch: Don't redefine MW_INSTALL_PATH in config/index.php, remove the original definition

Modified: trunk/mediawiki/debian/changelog
===================================================================
--- trunk/mediawiki/debian/changelog	2012-04-11 09:16:19 UTC (rev 18300)
+++ trunk/mediawiki/debian/changelog	2012-04-11 09:16:21 UTC (rev 18301)
@@ -6,8 +6,10 @@
   [ Jonathan Wiltshire ]
   * debian/source/format: Switch to source format 3.0 (quilt)
   * debian/rules: Drop CDBS quilt logic
+  * debian_specific_config.patch: Don't just redefine MW_INSTALL_PATH,
+    remove the original definition (LP: #406358)
 
- -- Jonathan Wiltshire <debian at jwiltshire.org.uk>  Fri, 25 Jun 2010 23:39:43 +0100
+ -- Jonathan Wiltshire <debian at jwiltshire.org.uk>  Sat, 26 Jun 2010 00:14:31 +0100
 
 mediawiki (1:1.15.4-1) unstable; urgency=high
 

Modified: trunk/mediawiki/debian/patches/debian_specific_config.patch
===================================================================
--- trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:16:19 UTC (rev 18300)
+++ trunk/mediawiki/debian/patches/debian_specific_config.patch	2012-04-11 09:16:21 UTC (rev 18301)
@@ -1,8 +1,14 @@
-Index: mediawiki-1.15.2/config/index.php
-===================================================================
---- mediawiki-1.15.2.orig/config/index.php	2009-05-08 00:51:15.000000000 -0500
-+++ mediawiki-1.15.2/config/index.php	2010-03-15 12:01:59.000000000 -0500
-@@ -232,7 +232,7 @@
+--- mediawiki-1.15.4.orig/config/index.php
++++ mediawiki-1.15.4/config/index.php
+@@ -28,7 +28,6 @@
+ 
+ # Attempt to set up the include path, to fix problems with relative includes
+ $IP = dirname( dirname( __FILE__ ) );
+-define( 'MW_INSTALL_PATH', $IP );
+ 
+ # Define an entry point and include some files
+ define( "MEDIAWIKI", true );
+@@ -232,7 +231,7 @@
  if( !is_writable( "." ) ) {
  	dieout( "<h2>Can't write config file, aborting</h2>
  
@@ -11,7 +17,7 @@
  	writable by the web server. Once configuration is done you'll move the created
  	<tt>LocalSettings.php</tt> to the parent directory, and for added safety you can
  	then remove the <tt>config</tt> subdirectory entirely.</p>
-@@ -1602,16 +1602,7 @@
+@@ -1602,16 +1601,7 @@
  <div class="success-box">
  <p>Installation successful!</p>
  <p>To complete the installation, please do the following:
@@ -29,7 +35,7 @@
  </div>
  EOT;
  	} else {
-@@ -1619,7 +1610,7 @@
+@@ -1619,7 +1609,7 @@
  <div class="success-box">
  <p>
  <span class="success-message">Installation successful!</span>
@@ -38,7 +44,7 @@
  <a href="../$script"> this link</a> to your wiki.</p>
  <p>You should change file permissions for <tt>LocalSettings.php</tt> as required to
  prevent other users on the server reading passwords and altering configuration data.</p>
-@@ -1773,6 +1764,12 @@
+@@ -1773,6 +1763,12 @@
  
  # If you customize your file layout, set \$IP to the directory that contains
  # the other MediaWiki files. It will be used as a base to locate files.
@@ -51,7 +57,7 @@
  if( defined( 'MW_INSTALL_PATH' ) ) {
  	\$IP = MW_INSTALL_PATH;
  } else {
-@@ -1872,6 +1869,11 @@
+@@ -1872,6 +1868,11 @@
  
  \$wgDiff3 = \"{$slconf['diff3']}\";
  



More information about the evolvis-commits mailing list