[Fusionforge-commits] r12118 - in branches/Branch_5_1/src/plugins/mediawiki: bin www
Roland Mas
lolando at libremir.placard.fr.eu.org
Mon Jan 31 17:04:12 CET 2011
Author: lolando
Date: 2011-01-31 17:04:12 +0100 (Mon, 31 Jan 2011)
New Revision: 12118
Modified:
branches/Branch_5_1/src/plugins/mediawiki/bin/mw-wrapper.php
branches/Branch_5_1/src/plugins/mediawiki/www/LocalSettings.php
Log:
Unbreak command-line script wrapper for Mediawiki
Modified: branches/Branch_5_1/src/plugins/mediawiki/bin/mw-wrapper.php
===================================================================
--- branches/Branch_5_1/src/plugins/mediawiki/bin/mw-wrapper.php 2011-01-31 14:41:59 UTC (rev 12117)
+++ branches/Branch_5_1/src/plugins/mediawiki/bin/mw-wrapper.php 2011-01-31 16:04:12 UTC (rev 12118)
@@ -61,7 +61,7 @@
$src_path = forge_get_config('src_path', 'mediawiki');
$mwscript = $src_path . '/maintenance/'.$mwscript ;
-array_unshift ($argv, $mwscript, '--conf', $gfplugins . 'mediawiki/www/LocalSettings.php') ;
+array_unshift ($argv, $mwscript, '--conf', $fusionforge_basedir . '/plugins/mediawiki/www/LocalSettings.php') ;
while (@ob_end_flush());
Modified: branches/Branch_5_1/src/plugins/mediawiki/www/LocalSettings.php
===================================================================
--- branches/Branch_5_1/src/plugins/mediawiki/www/LocalSettings.php 2011-01-31 14:41:59 UTC (rev 12117)
+++ branches/Branch_5_1/src/plugins/mediawiki/www/LocalSettings.php 2011-01-31 16:04:12 UTC (rev 12118)
@@ -258,56 +258,58 @@
}
$wgHooks['PersonalUrls'][]='NoLinkOnMainPage';
-class SpecialForgeRedir extends SpecialPage {
- var $dstappendself = false;
+if (isset($_SERVER['SERVER_SOFTWARE'])) {
+ class SpecialForgeRedir extends SpecialPage {
+ var $dstappendself = false;
- function getTitle() {
- return 'SpecialForgeRedir';
- }
+ function getTitle() {
+ return 'SpecialForgeRedir';
+ }
- function getRedirect() {
- return $this;
- }
+ function getRedirect() {
+ return $this;
+ }
- function getRedirectQuery() {
- return $this;
- }
+ function getRedirectQuery() {
+ return $this;
+ }
- function getFullUrl() {
- $u = $this->dst;
- if ($this->dstappendself) {
- $u .= urlencode(getStringFromServer('REQUEST_URI'));
+ function getFullUrl() {
+ $u = $this->dst;
+ if ($this->dstappendself) {
+ $u .= urlencode(getStringFromServer('REQUEST_URI'));
+ }
+ return util_make_url($u);
}
- return util_make_url($u);
}
-}
-class SpecialForgeRedirLogin extends SpecialForgeRedir {
- var $dstappendself = true;
- var $dst = '/account/login.php?return_to=';
-}
+ class SpecialForgeRedirLogin extends SpecialForgeRedir {
+ var $dstappendself = true;
+ var $dst = '/account/login.php?return_to=';
+ }
-class SpecialForgeRedirCreateAccount extends SpecialForgeRedir {
- var $dst = '/account/register.php';
-}
+ class SpecialForgeRedirCreateAccount extends SpecialForgeRedir {
+ var $dst = '/account/register.php';
+ }
-class SpecialForgeRedirResetPass extends SpecialForgeRedir {
- var $dst = '/account/lostpw.php';
-}
+ class SpecialForgeRedirResetPass extends SpecialForgeRedir {
+ var $dst = '/account/lostpw.php';
+ }
-class SpecialForgeRedirLogout extends SpecialForgeRedir {
- var $dstappendself = true;
- var $dst = '/account/logout.php?return_to=';
-}
+ class SpecialForgeRedirLogout extends SpecialForgeRedir {
+ var $dstappendself = true;
+ var $dst = '/account/logout.php?return_to=';
+ }
-function DisableLogInOut(&$mList) {
- $mList['Userlogin'] = 'SpecialForgeRedirLogin';
- $mList['CreateAccount'] = 'SpecialForgeRedirCreateAccount';
- $mList['Resetpass'] = 'SpecialForgeRedirResetPass';
- $mList['Userlogout'] = 'SpecialForgeRedirLogout';
- return true;
+ function DisableLogInOut(&$mList) {
+ $mList['Userlogin'] = 'SpecialForgeRedirLogin';
+ $mList['CreateAccount'] = 'SpecialForgeRedirCreateAccount';
+ $mList['Resetpass'] = 'SpecialForgeRedirResetPass';
+ $mList['Userlogout'] = 'SpecialForgeRedirLogout';
+ return true;
+ }
+ $GLOBALS['wgHooks']['SpecialPage_initList'][] = 'DisableLogInOut';
}
-$GLOBALS['wgHooks']['SpecialPage_initList'][] = 'DisableLogInOut';
$GLOBALS['wgHooks']['UserLoadFromSession'][]='FusionForgeMWAuth';
More information about the Fusionforge-commits
mailing list