| Index: trunk/extensions/Configure/findSettings.php |
| — | — | @@ -11,9 +11,10 @@ |
| 12 | 12 | * @license GPLv2 or higher |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | | -$dir = dirname( __FILE__ ); |
| 16 | | -$IP = "$dir/../.."; |
| 17 | | -@include( "$dir/../CorePath.php" ); // Allow override |
| | 15 | +$IP = getenv( 'MW_INSTALL_PATH' ); |
| | 16 | +if( $IP === false ) |
| | 17 | + $IP = dirname( __FILE__ ). '/../..'; |
| | 18 | + |
| 18 | 19 | require_once( "$IP/maintenance/commandLine.inc" ); |
| 19 | 20 | |
| 20 | 21 | # Functions |
| — | — | @@ -58,7 +59,7 @@ |
| 59 | 60 | preg_match_all( '/\[\[[Mm]anual:\$(wg[A-Za-z0-9]+)\|/', $cont, $m ); |
| 60 | 61 | $allSettings = array_unique( $m[1] ); |
| 61 | 62 | } else { |
| 62 | | - $allSettings = array_keys( ConfigurationSettings::getAllSettings( CONF_SETTINGS_CORE ) ); |
| | 63 | + $allSettings = array_keys( ConfigurationSettings::singleton( CONF_SETTINGS_CORE )->getAllSettings() ); |
| 63 | 64 | } |
| 64 | 65 | |
| 65 | 66 | // Now we'll need to open DefaultSettings.php |
| — | — | @@ -71,7 +72,7 @@ |
| 72 | 73 | $remain = array_diff( $allSettings, $definedSettings ); |
| 73 | 74 | $obsolete = array(); |
| 74 | 75 | foreach( $remain as $setting ){ |
| 75 | | - if( ConfigurationSettings::isSettingAvailable( CONF_SETTINGS_CORE, $setting ) ) |
| | 76 | + if( ConfigurationSettings::singleton( CONF_SETTINGS_CORE )->isSettingAvailable( $setting ) ) |
| 76 | 77 | $obsolete[] = $setting; |
| 77 | 78 | } |
| 78 | 79 | |
| Index: trunk/extensions/Configure/CHANGELOG |
| — | — | @@ -1,9 +1,14 @@ |
| 2 | 2 | This file lists changes on this extension. |
| 3 | 3 | Localisation updates are done on betawiki and aren't listed here. |
| 4 | 4 | |
| | 5 | +0.6.2 - 18 July 2008 |
| | 6 | + * maintenance scripts now use MW_INSTALL_PATH env variable to locate the wiki. |
| | 7 | + * findSettings.php was broken since 0.6.0, now fixed. |
| | 8 | + * Renamed $wgDefaultDirectoryChmod to $wgDirectoryMode. |
| | 9 | + |
| 5 | 10 | 0.6.1 - 17 July 2008 |
| 6 | | - * Added $wgDefaultDirectoryChmod and $wgDiff |
| 7 | | - * Fixed array type of $wgContentNamespaces |
| | 11 | + * Added $wgDefaultDirectoryChmod and $wgDiff |
| | 12 | + * Fixed array type of $wgContentNamespaces |
| 8 | 13 | |
| 9 | 14 | 0.6.0 - 16 July 2008 |
| 10 | 15 | Added following settings to configure Configure itself: |
| Index: trunk/extensions/Configure/Configure.settings-core.php |
| — | — | @@ -21,7 +21,7 @@ |
| 22 | 22 | 'wgActionPaths' => 'array', |
| 23 | 23 | 'wgAppleTouchIcon' => 'text', |
| 24 | 24 | 'wgArticlePath' => 'text', |
| 25 | | - 'wgDefaultDirectoryChmod' => 'int', |
| | 25 | + 'wgDirectoryMode' => 'int', |
| 26 | 26 | 'wgDiff' => 'text', |
| 27 | 27 | 'wgDiff3' => 'text', |
| 28 | 28 | 'wgFavicon' => 'text', |
| — | — | @@ -821,7 +821,7 @@ |
| 822 | 822 | 'wgActionPaths', |
| 823 | 823 | 'wgAppleTouchIcon', |
| 824 | 824 | 'wgArticlePath', |
| 825 | | - 'wgDefaultDirectoryChmod', |
| | 825 | + 'wgDirectoryMode', |
| 826 | 826 | 'wgDiff', |
| 827 | 827 | 'wgDiff3', |
| 828 | 828 | 'wgFavicon', |
| — | — | @@ -1120,7 +1120,7 @@ |
| 1121 | 1121 | 'wgRC2UDPOmitBots' => array( array( '1.13alpha', '>=' ) ), |
| 1122 | 1122 | 'wgExtensionAliasesFiles' => array( array( '1.13alpha', '>=' ) ), |
| 1123 | 1123 | 'wgXMLMimeTypes' => array( array( '1.13alpha', '>=' ) ), |
| 1124 | | - 'wgDefaultDirectoryChmod' => array( array( '1.13alpha', '>=' ) ), |
| | 1124 | + 'wgDirectoryMode' => array( array( '1.13alpha', '>=' ) ), |
| 1125 | 1125 | 'wgDiff' => array( array( '1.13alpha', '>=' ) ), |
| 1126 | 1126 | ## Obsolete |
| 1127 | 1127 | 'wgProfileSampleRate' => array( array( '1.8alpha', '<' ) ), |
| Index: trunk/extensions/Configure/Configure.php |
| — | — | @@ -10,6 +10,16 @@ |
| 11 | 11 | * @author Alexandre Emsenhuber |
| 12 | 12 | */ |
| 13 | 13 | |
| | 14 | +## Adding credit :) |
| | 15 | +$wgExtensionCredits['specialpage'][] = array( |
| | 16 | + 'name' => 'Configure', |
| | 17 | + 'author' => 'Alexandre Emsenhuber', |
| | 18 | + 'url' => 'http://www.mediawiki.org/wiki/Extension:Configure', |
| | 19 | + 'description' => 'Allow authorised users to configure the wiki by a web-based interface', |
| | 20 | + 'descriptionmsg' => 'configure-desc', |
| | 21 | + 'version' => '0.6.2', |
| | 22 | +); |
| | 23 | + |
| 14 | 24 | ## Configuration part |
| 15 | 25 | |
| 16 | 26 | /** |
| — | — | @@ -74,16 +84,6 @@ |
| 75 | 85 | */ |
| 76 | 86 | $wgConfigureStyleVersion = '5'; |
| 77 | 87 | |
| 78 | | -## Adding credit :) |
| 79 | | -$wgExtensionCredits['specialpage'][] = array( |
| 80 | | - 'name' => 'Configure', |
| 81 | | - 'author' => 'Alexandre Emsenhuber', |
| 82 | | - 'url' => 'http://www.mediawiki.org/wiki/Extension:Configure', |
| 83 | | - 'description' => 'Allow authorised users to configure the wiki by a web-based interface', |
| 84 | | - 'descriptionmsg' => 'configure-desc', |
| 85 | | - 'version' => '0.6.1', |
| 86 | | -); |
| 87 | | - |
| 88 | 88 | ## Adding new rights... |
| 89 | 89 | $wgAvailableRights[] = 'configure'; |
| 90 | 90 | $wgAvailableRights[] = 'configure-all'; |
| — | — | @@ -100,16 +100,16 @@ |
| 101 | 101 | #$wgGroupPermissions['bureaucrat']['configure-interwiki'] = true; |
| 102 | 102 | #$wgGroupPermissions['developer']['configure-all'] = true; |
| 103 | 103 | |
| | 104 | +## Rights for Special:Extensions |
| | 105 | +$wgGroupPermissions['bureaucrat']['extensions'] = true; |
| | 106 | +#$wgGroupPermissions['bureaucrat']['extensions-interwiki'] = true; |
| | 107 | +#$wgGroupPermissions['developer']['extensions-all'] = true; |
| | 108 | + |
| 104 | 109 | ## Rights for Special:ViewConfig |
| 105 | 110 | $wgGroupPermissions['sysop']['viewconfig'] = true; |
| 106 | 111 | #$wgGroupPermissions['sysop']['viewconfig-interwiki'] = true; |
| 107 | 112 | #$wgGroupPermissions['developer']['viewconfig-all'] = true; |
| 108 | 113 | |
| 109 | | -## Rights for Special:Extensions |
| 110 | | -$wgGroupPermissions['bureaucrat']['extensions'] = true; |
| 111 | | -#$wgGroupPermissions['bureaucrat']['extensions-interwiki'] = true; |
| 112 | | -#$wgGroupPermissions['developer']['extensions-all'] = true; |
| 113 | | - |
| 114 | 114 | $dir = dirname( __FILE__ ) . '/'; |
| 115 | 115 | |
| 116 | 116 | ## Define some functions |
| Index: trunk/extensions/Configure/manage.php |
| — | — | @@ -12,9 +12,10 @@ |
| 13 | 13 | $optionsWithArgs = array( 'revert', 'delete' ); |
| 14 | 14 | define( 'EXT_CONFIGURE_NO_EXTRACT', true ); |
| 15 | 15 | |
| 16 | | -$dir = dirname( __FILE__ ); |
| 17 | | -$IP = "$dir/../.."; |
| 18 | | -@include( "$dir/../CorePath.php" ); // Allow override |
| | 16 | +$IP = getenv( 'MW_INSTALL_PATH' ); |
| | 17 | +if( $IP === false ) |
| | 18 | + $IP = dirname( __FILE__ ). '/../..'; |
| | 19 | + |
| 19 | 20 | require_once( "$IP/maintenance/commandLine.inc" ); |
| 20 | 21 | |
| 21 | 22 | require_once( dirname( __FILE__ ) . "/manage.inc" ); |