http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89741
Revision: 89741
Author: catrope
Date: 2011-06-08 20:19:45 +0000 (Wed, 08 Jun 2011)
Log Message:
-----------
1.17: MFT r84739, r89707
Modified Paths:
--------------
branches/REL1_17/phase3/includes/MagicWord.php
branches/REL1_17/phase3/includes/installer/Installer.php
Property Changed:
----------------
branches/REL1_17/phase3/includes/installer/Installer.php
Modified: branches/REL1_17/phase3/includes/MagicWord.php
===================================================================
--- branches/REL1_17/phase3/includes/MagicWord.php 2011-06-08 20:18:34 UTC
(rev 89740)
+++ branches/REL1_17/phase3/includes/MagicWord.php 2011-06-08 20:19:45 UTC
(rev 89741)
@@ -178,7 +178,7 @@
/**#@-*/
- function __construct($id = 0, $syn = '', $cs = false) {
+ function __construct($id = 0, $syn = array(), $cs = false) {
$this->mId = $id;
$this->mSynonyms = (array)$syn;
$this->mCaseSensitive = $cs;
Modified: branches/REL1_17/phase3/includes/installer/Installer.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/Installer.php 2011-06-08
20:18:34 UTC (rev 89740)
+++ branches/REL1_17/phase3/includes/installer/Installer.php 2011-06-08
20:19:45 UTC (rev 89741)
@@ -1212,7 +1212,6 @@
global $IP;
$exts = $this->getVar( '_Extensions' );
$IP = $this->getVar( 'IP' );
- $path = $IP . '/extensions';
/**
* We need to include DefaultSettings before including
extensions to avoid
@@ -1226,7 +1225,7 @@
require( "$IP/includes/DefaultSettings.php" );
foreach( $exts as $e ) {
- require_once( "$path/$e/$e.php" );
+ require_once( $IP . '/extensions' . "/$e/$e.php" );
}
$hooksWeWant = isset( $wgHooks['LoadExtensionSchemaUpdates'] ) ?
Property changes on: branches/REL1_17/phase3/includes/installer/Installer.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer/Installer.php:51646
/branches/new-installer/phase3/includes/installer/Installer.php:43664-66004
/branches/sqlite/includes/installer/Installer.php:58211-58321
/branches/wmf-deployment/includes/installer/Installer.php:53381
/trunk/phase3/includes/installer/Installer.php:81731,82038-82039,82247,82845,82847-82848,84431,84464,84543,84553,84573-84574,84577,84579,84729,84755,84765,84820,84846,84875,84881-84882,84905,84970,84976,84985,85032,85140,85143,85152,85178,85194,85199,85377,85547,85555,85583,85803,85881,86065,86100,86121,86130,86142,86146,86182,86210,86257,86385,86394,87027,87203,87222,87265,87494,87497,87711,87840,88076,88492,88658,88870-88871,89003,89108,89114-89115,89129,89529,89532,89615,89653
+ /branches/REL1_15/phase3/includes/installer/Installer.php:51646
/branches/new-installer/phase3/includes/installer/Installer.php:43664-66004
/branches/sqlite/includes/installer/Installer.php:58211-58321
/branches/wmf-deployment/includes/installer/Installer.php:53381
/trunk/phase3/includes/installer/Installer.php:81731,82038-82039,82247,82845,82847-82848,84431,84464,84543,84553,84573-84574,84577,84579,84729,84739,84755,84765,84820,84846,84875,84881-84882,84905,84970,84976,84985,85032,85140,85143,85152,85178,85194,85199,85377,85547,85555,85583,85803,85881,86065,86100,86121,86130,86142,86146,86182,86210,86257,86385,86394,87027,87203,87222,87265,87494,87497,87711,87840,88076,88492,88658,88870-88871,89003,89108,89114-89115,89129,89529,89532,89615,89653,89707
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
