| Index: branches/REL1_17/phase3/includes/installer/Installer.php |
| — | — | @@ -1212,7 +1212,6 @@ |
| 1213 | 1213 | global $IP; |
| 1214 | 1214 | $exts = $this->getVar( '_Extensions' ); |
| 1215 | 1215 | $IP = $this->getVar( 'IP' ); |
| 1216 | | - $path = $IP . '/extensions'; |
| 1217 | 1216 | |
| 1218 | 1217 | /** |
| 1219 | 1218 | * We need to include DefaultSettings before including extensions to avoid |
| — | — | @@ -1226,7 +1225,7 @@ |
| 1227 | 1226 | require( "$IP/includes/DefaultSettings.php" ); |
| 1228 | 1227 | |
| 1229 | 1228 | foreach( $exts as $e ) { |
| 1230 | | - require_once( "$path/$e/$e.php" ); |
| | 1229 | + require_once( $IP . '/extensions' . "/$e/$e.php" ); |
| 1231 | 1230 | } |
| 1232 | 1231 | |
| 1233 | 1232 | $hooksWeWant = isset( $wgHooks['LoadExtensionSchemaUpdates'] ) ? |
| Property changes on: branches/REL1_17/phase3/includes/installer/Installer.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1234 | 1233 | Merged /trunk/phase3/includes/installer/Installer.php:r84739,89707 |
| Index: branches/REL1_17/phase3/includes/MagicWord.php |
| — | — | @@ -178,7 +178,7 @@ |
| 179 | 179 | |
| 180 | 180 | /**#@-*/ |
| 181 | 181 | |
| 182 | | - function __construct($id = 0, $syn = '', $cs = false) { |
| | 182 | + function __construct($id = 0, $syn = array(), $cs = false) { |
| 183 | 183 | $this->mId = $id; |
| 184 | 184 | $this->mSynonyms = (array)$syn; |
| 185 | 185 | $this->mCaseSensitive = $cs; |