[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1916-g7422378

Franck Villaume nerville at libremir.placard.fr.eu.org
Thu Jun 8 14:48:45 CEST 2017


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  74223781926957f7269a7e0878319add6b011e92 (commit)
      from  b010a5844fb7b1d33df2313cdc135ceaa5f61d20 (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=74223781926957f7269a7e0878319add6b011e92

commit 74223781926957f7269a7e0878319add6b011e92
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Jun 8 12:48:39 2017 +0000

    mediawiki not yet ready for debian src install. URL vs. URI

diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index 1479ee2..f51fc0a 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -35,8 +35,7 @@ if [ -e /etc/debian_version ]; then
 	apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
 	cvs subversion viewvc python-pycurl git xinetd \
 	python-moinmoin libapache2-mod-wsgi python-psycopg2 \
-	unoconv poppler-utils dpkg-dev \
-        mediawiki
+	unoconv poppler-utils dpkg-dev 
     if ! dpkg-vendor --is Ubuntu; then
 	apt-get install locales-all  # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
     fi
diff --git a/src/plugins/mediawiki/common/mediawikiPlugin.class.php b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
index e8d32d6..5432c55 100644
--- a/src/plugins/mediawiki/common/mediawikiPlugin.class.php
+++ b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
@@ -93,12 +93,12 @@ _("This plugin allows each project to embed Mediawiki under a tab.");
 			}
 			if ( $project->usesPlugin ( $this->name ) ) {
 				$params['TITLES'][]=$this->text;
-				$params['DIRS'][]=util_make_url('/plugins/mediawiki/wiki/'.$project->getUnixName().'/index.php');
+				$params['DIRS'][]=util_make_uri('/plugins/mediawiki/wiki/'.$project->getUnixName().'/index.php');
 				if (session_loggedin()) {
 					$user = session_get_user();
 					$userperm = $project->getPermission();
 					if ($userperm->isAdmin()) {
-						$params['ADMIN'][] = util_make_url('/plugins/mediawiki/plugin_admin.php?group_id='.$project->getID());
+						$params['ADMIN'][] = util_make_uri('/plugins/mediawiki/plugin_admin.php?group_id='.$project->getID());
 					}
 				}
 				$params['TOOLTIPS'][] = _('Mediawiki Space');

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

Summary of changes:
 autoinstall/install-src.sh                             | 3 +--
 src/plugins/mediawiki/common/mediawikiPlugin.class.php | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list