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 4bf8185a6b7e1880a3672d2595d076241dad91f0 (commit)
via 9b89c48bb514945c419c159dfd00cdf2852f71b2 (commit)
from 2f0838cc1a659d7f906ac3a7caa520861a0ea78d (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=4bf8185a6b7e1880a3672d2595d076241dad91f0
commit 4bf8185a6b7e1880a3672d2595d076241dad91f0
Author: Franck Villaume <[email protected]>
Date: Sun Apr 18 09:39:56 2021 +0200
Less string
diff --git a/src/www/register/index.php b/src/www/register/index.php
index 713508a..8f45496 100644
--- a/src/www/register/index.php
+++ b/src/www/register/index.php
@@ -155,7 +155,7 @@ if (getStringFromRequest('submit')) {
}
if (!$group->approve($u)) {
- echo $HTML->error_msg(sprintf(_('Approval
Error: %s'), $group->getErrorMessage()));
+ echo $HTML->error_msg(_('Approval Error')._(':
'), $group->getErrorMessage());
} else {
echo '<p>';
echo _('Your project has been automatically
approved. You should receive an email containing further information shortly.');
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9b89c48bb514945c419c159dfd00cdf2852f71b2
commit 9b89c48bb514945c419c159dfd00cdf2852f71b2
Author: Franck Villaume <[email protected]>
Date: Sun Apr 18 09:39:40 2021 +0200
fix mediawiki detection on debian 9
diff --git a/src/plugins/mediawiki/bin/install.sh
b/src/plugins/mediawiki/bin/install.sh
index 7e4a7e9..83ac0bc 100755
--- a/src/plugins/mediawiki/bin/install.sh
+++ b/src/plugins/mediawiki/bin/install.sh
@@ -5,7 +5,7 @@ source_path=$(forge_get_config source_path)
data_path=$(forge_get_config data_path)
plugindir=$(forge_get_config plugins_path)/mediawiki
-mediawikidir=$(find /usr/share -type d -name 'mediawiki' | grep -E -v
'doc|extensions|resources')
+mediawikidir=$(find /usr/share -type d -name 'mediawiki' | grep -E -v
'doc|extensions|resources|vendor')
# Debian: /usr/share/mediawiki/
# CentOS7: /usr/share/mediawiki123/
# OpenSUSE Leap 15: /usr/share/php/mediawiki/
-----------------------------------------------------------------------
Summary of changes:
src/plugins/mediawiki/bin/install.sh | 2 +-
src/www/register/index.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
