This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 713a1d649bbafaf385f5dc510c296528f07e083d (commit)
via 3b508241b848cb1f0b268c56572f7c045c5c77b4 (commit)
from 8336ec72e18f7f41f4ede643a83b9414dd6de67e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=713a1d649bbafaf385f5dc510c296528f07e083d
commit 713a1d649bbafaf385f5dc510c296528f07e083d
Author: Franck Villaume <[email protected]>
Date: Fri Sep 29 08:24:20 2017 +0000
reactivate mediawiki test on debian. 2nd try
diff --git a/tests/func/60_PluginsMediawiki/mediawikiTest.php
b/tests/func/60_PluginsMediawiki/mediawikiTest.php
index d04abd2..7e09f67 100644
--- a/tests/func/60_PluginsMediawiki/mediawikiTest.php
+++ b/tests/func/60_PluginsMediawiki/mediawikiTest.php
@@ -31,7 +31,6 @@ class PluginMediawiki extends FForge_SeleniumTestCase
{
$this->skip_on_deb_installs();
$this->skip_on_rpm_installs();
- $this->skip_on_debian();
$this->loadAndCacheFixture();
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=3b508241b848cb1f0b268c56572f7c045c5c77b4
commit 3b508241b848cb1f0b268c56572f7c045c5c77b4
Author: Franck Villaume <[email protected]>
Date: Fri Sep 29 08:23:33 2017 +0000
mediawiki plugin: ugly hack to get >= 1.24 version to work
diff --git a/src/plugins/mediawiki/www/LocalSettings.php
b/src/plugins/mediawiki/www/LocalSettings.php
index 4cf7389..f4e4148 100644
--- a/src/plugins/mediawiki/www/LocalSettings.php
+++ b/src/plugins/mediawiki/www/LocalSettings.php
@@ -211,9 +211,10 @@ if
(!isset($fusionforge_plugin_mediawiki_LocalSettings_included)) {
}
function FusionForgeMWAuth( $user, &$result ) {
- global $fusionforgeproject, $wgGroupPermissions ;
+ global $fusionforgeproject, $wgGroupPermissions, $wgVersion ;
session_set();
+ $wgVersionArr = explode('.', $wgVersion);
if (session_loggedin()) {
$u = session_get_user();
@@ -226,7 +227,9 @@ if
(!isset($fusionforge_plugin_mediawiki_LocalSettings_included)) {
$mwu->setPassword (User::randomPassword());
$mwu->setRealName ($u->getRealName ()) ;
$mwu->setToken ();
- $mwu->saveSettings ();
+ if (!$wgVersionArr[0] == 1 && !$wgVersionArr[1]
>= 24) {
+ $mwu->saveSettings ();
+ }
}
$user->mId=$mwu->getID();
$user->loadFromId() ;
@@ -270,7 +273,9 @@ if
(!isset($fusionforge_plugin_mediawiki_LocalSettings_included)) {
}
$user->setCookies ();
- $user->saveSettings ();
+ if (!$wgVersionArr[0] == 1 && !$wgVersionArr[1] >= 24) {
+ $user->saveSettings ();
+ }
wfSetupSession ();
} else {
$user->logout ();
-----------------------------------------------------------------------
Summary of changes:
src/plugins/mediawiki/www/LocalSettings.php | 11 ++++++++---
tests/func/60_PluginsMediawiki/mediawikiTest.php | 1 -
2 files changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
