[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1912-g97885bc

[Franck Villaume]

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  97885bc0b05ffc416c2cfcbbb79e9562ff0392a8 (commit)
      from  a943ffec31608e8cfa83202a7b658bd91ef91fd4 (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=97885bc0b05ffc416c2cfcbbb79e9562ff0392a8

commit 97885bc0b05ffc416c2cfcbbb79e9562ff0392a8
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Jun 8 10:34:58 2017 +0000

    make mediawiki plugin available

diff --git a/src/plugins/mediawiki/bin/install.sh b/src/plugins/mediawiki/bin/install.sh
index b1b42bb..3b895d8 100755
--- a/src/plugins/mediawiki/bin/install.sh
+++ b/src/plugins/mediawiki/bin/install.sh
@@ -10,7 +10,7 @@ mediawikidir=$( \
     | tail -1)
 # Debian: /usr/share/mediawiki/
 # CentOS6: /usr/share/mediawiki119/
-# CentOS7: /usr/share/mediawiki/
+# CentOS7: /usr/share/mediawiki123/
 
 upgrade_mediawikis () {
     # Upgrade Mediawiki database schemas
@@ -35,7 +35,6 @@ case "$1" in
         ln -nfs $mediawikidir/maintenance          $plugindir/www/
         ln -nfs $mediawikidir/opensearch_desc.php  $plugindir/www/
         ln -nfs $mediawikidir/profileinfo.php      $plugindir/www/
-        ln -nfs $mediawikidir/redirect.php         $plugindir/www/
         ln -nfs $mediawikidir/thumb.php            $plugindir/www/
 
 	ln -nfs $mediawikidir/skins $plugindir/www/
diff --git a/src/plugins/mediawiki/etc/httpd.conf.d/plugin-mediawiki.inc b/src/plugins/mediawiki/etc/httpd.conf.d/plugin-mediawiki.inc
index 4991d31..378d43a 100644
--- a/src/plugins/mediawiki/etc/httpd.conf.d/plugin-mediawiki.inc
+++ b/src/plugins/mediawiki/etc/httpd.conf.d/plugin-mediawiki.inc
@@ -17,3 +17,14 @@ AliasMatch ^/plugins/mediawiki/dumps/(.*)$ ${FF__core__data_path}/plugins/mediaw
 <Directory ${FF__core__data_path}/plugins/mediawiki/projects>
         Require all granted
 </Directory>
+
+<LocationMatch "${FF__core__url_prefix}plugins/mediawiki/wiki/[-a-zA-Z0-9_]*/skins/(.*)">
+  <IfVersion >= 2.3>
+    Require all granted
+  </IfVersion>
+  <IfVersion < 2.3>
+    order allow,deny
+    allow from all
+  </IfVersion>
+</LocationMatch>
+
diff --git a/src/plugins/mediawiki/etc/mediawiki.ini b/src/plugins/mediawiki/etc/mediawiki.ini
index 09f4cb6..818018a 100644
--- a/src/plugins/mediawiki/etc/mediawiki.ini
+++ b/src/plugins/mediawiki/etc/mediawiki.ini
@@ -5,7 +5,7 @@
 ; valid means : production ready.
 ; Any other strings means it's under work or broken and plugin 
 ; is available in installation_environment = development only.
-plugin_status = "unmaintained"
+plugin_status = "valid"
 
 ; Whether uploads are allowed on the mediawiki
 enable_uploads = false
diff --git a/src/plugins/mediawiki/www/LocalSettings.php b/src/plugins/mediawiki/www/LocalSettings.php
index 2e07bab..c5b9d02 100644
--- a/src/plugins/mediawiki/www/LocalSettings.php
+++ b/src/plugins/mediawiki/www/LocalSettings.php
@@ -177,7 +177,6 @@ $GLOBALS['sys_session_expire'] = forge_get_config('session_expire');
 $GLOBALS['REMOTE_ADDR'] = getStringFromServer('REMOTE_ADDR') ;
 $GLOBALS['HTTP_USER_AGENT'] = getStringFromServer('HTTP_USER_AGENT') ;
 
-require_once("$IP/includes/Exception.php");
 require_once("$IP/includes/db/Database.php");
 if (forge_get_config('mw_dbtype', 'mediawiki')=='mysql'){
 	require_once 'DatabaseForgeMysql.php';

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/mediawiki/bin/install.sh                        |  3 +--
 src/plugins/mediawiki/etc/httpd.conf.d/plugin-mediawiki.inc | 11 +++++++++++
 src/plugins/mediawiki/etc/mediawiki.ini                     |  2 +-
 src/plugins/mediawiki/www/LocalSettings.php                 |  1 -
 4 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge