Sisyphus repository
Last update: 1 october 2023 | SRPMs: 18631 | Visits: 37046971
en ru br
ALT Linux repos
S:1.40.0-alt1
D:1.13.0-alt1
5.0: 1.13.0-alt3
4.1: 1.13.0-alt2.M41.2
4.0: 1.13.0-alt2.M40.1
+backports:1.13.0-alt2.M40.1

Group :: Networking/WWW
RPM: mediawiki

 Main   Changelog   Spec   Patches   Sources   Download   Gear   Bugs and FR  Repocop 

Patch: mediawiki-1.13.0-commoncode.patch
Download


--- ./includes/templates/NoLocalSettings.php.commoncode	2008-05-20 19:13:28.000000000 +0200
+++ ./includes/templates/NoLocalSettings.php	2008-08-16 13:48:05.000000000 +0200
@@ -42,7 +42,7 @@
 		<h1>MediaWiki <?php echo $wgVersion ?></h1>
 		<div class='error'>
 		<?php
-		if ( file_exists( 'config/LocalSettings.php' ) ) {
+		if ( file_exists( $DIR . '/config/LocalSettings.php' ) ) {
 			echo( 'To complete the installation, move <tt>config/LocalSettings.php</tt> to the parent directory.' );
 		} else {
 			echo( "Please <a href=\"${path}config/index.{$ext}\" title='setup'> set up the wiki</a> first." );
--- ./includes/WebStart.php.commoncode	2008-06-16 22:21:26.000000000 +0200
+++ ./includes/WebStart.php	2008-08-16 13:48:51.000000000 +0200
@@ -84,7 +84,7 @@
 # LocalSettings.php is the per site customization file. If it does not exit
 # the wiki installer need to be launched or the generated file moved from
 # ./config/ to ./
-if( !file_exists( "$IP/LocalSettings.php" ) ) {
+if( !file_exists( "$DIR/LocalSettings.php" ) ) {
 	require_once( "$IP/includes/DefaultSettings.php" ); # used for printing the version
 	require_once( "$IP/includes/templates/NoLocalSettings.php" );
 	die();
@@ -94,7 +94,7 @@
 require_once( "$IP/includes/AutoLoader.php" );
 
 # Include site settings. $IP may be changed (hopefully before the AutoLoader is invoked)
-require_once( "$IP/LocalSettings.php" );
+require_once( "$DIR/LocalSettings.php" );
 wfProfileOut( 'WebStart.php-conf' );
 
 wfProfileIn( 'WebStart.php-ob_start' );
--- ./maintenance/archives/upgradeWatchlist.php.commoncode	2008-07-11 00:00:04.000000000 +0200
+++ ./maintenance/archives/upgradeWatchlist.php	2008-08-16 13:49:46.000000000 +0200
@@ -15,7 +15,7 @@
 # Convert watchlists to new format
 
 global $IP;
-require_once( "../LocalSettings.php" );
+require_once( "$DIR/LocalSettings.php" );
 require_once( "$IP/Setup.php" );
 
 $wgTitle = Title::newFromText( "Rebuild links script" );
--- ./maintenance/update.php.commoncode	2008-07-19 14:15:07.000000000 +0200
+++ ./maintenance/update.php	2008-08-16 13:48:05.000000000 +0200
@@ -10,6 +10,9 @@
  * @ingroup Maintenance
  */
 
+$DIR=getcwd();
+chdir('/usr/share/mediawiki');
+
 /** */
 $wgUseMasterForMaintenance = true;
 $options = array( 'quick', 'nopurge' );
--- ./maintenance/commandLine.inc.commoncode	2008-06-16 22:21:26.000000000 +0200
+++ ./maintenance/commandLine.inc	2008-08-16 13:50:18.000000000 +0200
@@ -182,7 +182,7 @@
 	if ( isset( $options['conf'] ) ) {
 		$settingsFile = $options['conf'];
 	} else {
-		$settingsFile = "$IP/LocalSettings.php";
+		$settingsFile = "$DIR/LocalSettings.php";
 	}
 	if ( isset( $options['wiki'] ) ) {
 		$bits = explode( '-', $options['wiki'] );
@@ -208,7 +208,7 @@
 
 	$adminSettings = isset( $options['aconf'] )
 		? $options['aconf']
-		: "{$IP}/AdminSettings.php";
+		: "{$DIR}/AdminSettings.php";
 	if( is_readable( $adminSettings ) )
 		require_once( $adminSettings );
 
--- ./config/index.php.commoncode	2008-07-20 16:29:04.000000000 +0200
+++ ./config/index.php	2008-08-16 13:51:28.000000000 +0200
@@ -19,6 +19,8 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
+$DIR=dirname( getcwd() );
+chdir('/usr/share/mediawiki/config');
 error_reporting( E_ALL );
 header( "Content-type: text/html; charset=utf-8" );
 @ini_set( "display_errors", true );
@@ -27,7 +29,7 @@
 $wgRequestTime = microtime( true );
 
 # Attempt to set up the include path, to fix problems with relative includes
-$IP = dirname( dirname( __FILE__ ) );
+$IP = '/usr/share/mediawiki';
 define( 'MW_INSTALL_PATH', $IP );
 
 # Define an entry point and include some files
@@ -209,18 +211,18 @@
 
 /* Check for existing configurations and bug out! */
 
-if( file_exists( "../LocalSettings.php" ) ) {
+if( file_exists( "$DIR/LocalSettings.php" ) ) {
 	$script = defined('MW_INSTALL_PHP5_EXT') ? 'index.php5' : 'index.php';
 	dieout( "<p><strong>Setup has completed, <a href='../$script'>your wiki</a> is configured.</strong></p>
 	<p>Please delete the /config directory for extra security.</p>" );
 }
 
-if( file_exists( "./LocalSettings.php" ) ) {
+if( file_exists( "$DIR/LocalSettings.php" ) ) {
 	writeSuccessMessage();
 	dieout( '' );
 }
 
-if( !is_writable( "." ) ) {
+if( !is_writable( $DIR . "/config" ) ) {
 	dieout( "<h2>Can't write config file, aborting</h2>
 
 	<p>In order to configure the wiki you have to make the <tt>config</tt> subdirectory
@@ -1110,7 +1112,7 @@
 		$localSettings = "<" . "?php$endl$local";
 		// Fix up a common line-ending problem (due to CVS on Windows)
 		$localSettings = str_replace( "\r\n", "\n", $localSettings );
-		$f = fopen( "LocalSettings.php", 'xt' );
+		$f = fopen( $DIR . "/config/LocalSettings.php", 'xt' );
 
 		if( $f == false ) {
 			print( "</li>\n" );
@@ -1633,7 +1635,7 @@
 if( defined( 'MW_INSTALL_PATH' ) ) {
 	\$IP = MW_INSTALL_PATH;
 } else {
-	\$IP = dirname( __FILE__ );
+	\$IP = '/usr/share/mediawiki';
 }
 
 \$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" );
--- ./index.php.commoncode	2008-07-20 16:29:04.000000000 +0200
+++ ./index.php	2008-08-16 13:48:05.000000000 +0200
@@ -35,6 +35,9 @@
  */
 
 
+$DIR=getcwd();
+chdir('/usr/share/mediawiki');
+
 # Initialise common code
 $preIP = dirname( __FILE__ );
 require_once( "$preIP/includes/WebStart.php" );
 
design & coding: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
current maintainer: Michael Shigorin