[Fusionforge-commits] FusionForge branch master updated. 67b2e557b710f29d9ad6fe4a60661839b2c58f50

Marc-Etienne VARGENAU vargenau at fusionforge.org
Tue Jul 15 12:21:16 CEST 2014


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  67b2e557b710f29d9ad6fe4a60661839b2c58f50 (commit)
      from  9694555d636df70a8329e6264a62b4a6d965c40e (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 -----------------------------------------------------------------
commit 67b2e557b710f29d9ad6fe4a60661839b2c58f50
Author: Marc-Etienne Vargenau <Marc-Etienne.Vargenau at alcatel-lucent.com>
Date:   Tue Jul 15 12:20:35 2014 +0200

    wiki: translate string; remove trigger_error when success

diff --git a/src/plugins/wiki/www/lib/loadsave.php b/src/plugins/wiki/www/lib/loadsave.php
index b51f1dd..52c0728 100644
--- a/src/plugins/wiki/www/lib/loadsave.php
+++ b/src/plugins/wiki/www/lib/loadsave.php
@@ -105,17 +105,15 @@ function EndLoadDump(&$request)
             $all_users = array_unique(array_merge($all_users, $userids));
         }
         $editedby = sprintf(_("Edited by: %s"), $request->_user->getId());
-        $content = "Loaded the following pages:\n" . join("\n", $pages);
-        if (mail(join(',', $all_emails), "[" . WIKI_NAME . "] " . _("LoadDump"),
+        $content = _("Loaded the following pages:") . "\n" . join("\n", $pages);
+        if (!mail(join(',', $all_emails), "[" . WIKI_NAME . "] " . _("LoadDump"),
             _("LoadDump") . "\n" .
                 $editedby . "\n\n" .
                 $content)
-        )
-            trigger_error(sprintf(_("PageChange Notification of %s sent to %s"),
-                join("\n", $pages), join(',', $all_users)), E_USER_NOTICE);
-        else
+        ) {
             trigger_error(sprintf(_("PageChange Notification Error: Couldn't send %s to %s"),
                 join("\n", $pages), join(',', $all_users)), E_USER_WARNING);
+        }
         unset($pages);
         unset($all_emails);
         unset($all_users);

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

Summary of changes:
 src/plugins/wiki/www/lib/loadsave.php |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list