[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.1-6-g5b4f965

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Wed Jun 24 16:55:41 CEST 2015


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, 6.0 has been updated
       via  5b4f965658150d3fd77e9753b882d2f323910c3e (commit)
      from  f2d1d05cd98c298c641dc2a44b953b57c59eb5ee (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=5b4f965658150d3fd77e9753b882d2f323910c3e

commit 5b4f965658150d3fd77e9753b882d2f323910c3e
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Wed Jun 24 16:55:14 2015 +0200

    lists: fix description encoding depending on Mailman version (clean-up)

diff --git a/src/cronjobs/lists/mailing_lists_create.php b/src/cronjobs/lists/mailing_lists_create.php
index 8de0a57..740cca9 100755
--- a/src/cronjobs/lists/mailing_lists_create.php
+++ b/src/cronjobs/lists/mailing_lists_create.php
@@ -68,16 +68,17 @@ if (!is_dir(forge_get_config('data_path').'/dumps')) {
 $h1 = fopen(forge_get_config('data_path').'/dumps/mailman-aliases', "w");
 
 # Encoding hell
-if (strpos(file_get_contents($path_to_mailman.'/Mailman/Defaults.py'),
-           "sys.setdefaultencoding('utf-8')")) {
-	# Sniffed utf-8 patch (e.g. in Debian 8)
-	# Consistent encoding:
+if (file_exists($path_to_mailman.'/Mailman/Defaults.py')
+	&& strpos(file_get_contents($path_to_mailman.'/Mailman/Defaults.py'),
+              "sys.setdefaultencoding('utf-8')")) {
+	// Sniffed utf-8 patch (e.g. in Debian 8)
+	// Consistent encoding:
 	$coding = 'utf-8';
 } else {
-	# Standard Mailman 2.1.x, encoding used depends on the list language
-	# Using heuristic:
+	// Standard Mailman 2.1.x, encoding used depends on the list language
+	// Using heuristic:
 	$coding = 'iso-8859-1';
-	# Alternate fix: iconv('utf-8', 'us-ascii//TRANSLIT', $description);
+	// Alternate fix: iconv('utf-8', 'us-ascii//TRANSLIT', $description);
 }
 
 $mailingListIds = array();

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

Summary of changes:
 src/cronjobs/lists/mailing_lists_create.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list