[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 4381b66bee25d6b2b1bc23976483e451949ab3e5

Franck VILLAUME nerville at fusionforge.org
Sun Apr 14 19:58:40 CEST 2013


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, Branch_5_2 has been updated
       via  4381b66bee25d6b2b1bc23976483e451949ab3e5 (commit)
      from  8056465c7a8e4e1520d29db372ce31e11dc50c86 (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 4381b66bee25d6b2b1bc23976483e451949ab3e5
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Apr 14 19:58:18 2013 +0200

    apply #543: fix licence, fix rss display

diff --git a/src/common/widget/Widget_MyProjects.class.php b/src/common/widget/Widget_MyProjects.class.php
index 97117cd..d34a71e 100644
--- a/src/common/widget/Widget_MyProjects.class.php
+++ b/src/common/widget/Widget_MyProjects.class.php
@@ -2,21 +2,23 @@
 /**
  * Copyright (c) Xerox Corporation, Codendi Team, 2001-2009. All rights reserved
  * Copyright 2010, Franck Villaume - Capgemini
+ * Copyright 2013, French Ministry of National Education
+ * Copyright 2013, Franck Villaume - TrivialDev
  *
- * This file is a part of Codendi.
+ * This file is a part of Fusionforge.
  *
- * Codendi is free software; you can redistribute it and/or modify
+ * Fusionforge is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * Codendi is distributed in the hope that it will be useful,
+ * Fusionforge is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Codendi. If not, see <http://www.gnu.org/licenses/>.
+ * along with Fusionforge. If not, see <http://www.gnu.org/licenses/>.
  */
 
 require_once('Widget.class.php');
@@ -103,8 +105,8 @@ class Widget_MyProjects extends Widget {
 
 	function displayRss() {
 		$rss = new RSS(array(
-				'title'       => forge_get_config('forge_name').' - MyProjects',
-				'description' => 'My projects',
+				'title'       => forge_get_config('forge_name').' - '. _('MyProjects'),
+				'description' => _('My projects'),
 				'link'        => get_server_url(),
 				'language'    => 'en-us',
 				'copyright'   => 'Copyright Xerox',
@@ -113,14 +115,12 @@ class Widget_MyProjects extends Widget {
 		$projects = UserManager::instance()->getCurrentUser()->getGroups();
 		sortProjectList($projects);
 
-		if (!$result || $rows < 1) {
+		if (!$projects || count($projects) < 1) {
 			$rss->addItem(array(
-					  'title'       => 'Error',
+					  'title'       => forge_get_config('forge_name'),
 					  'description' => _("You're not a member of any project") . db_error(),
 					  'link'        => util_make_url()
 				  ));
-			$rss->display();
-			return ;
 		}
 
 		foreach ($projects as $project) {
@@ -143,6 +143,8 @@ class Widget_MyProjects extends Widget {
 						'link'        => $url)
 					);
 		}
+		$rss->display();
+		return;
 	}
 
 	function getDescription() {

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

Summary of changes:
 src/common/widget/Widget_MyProjects.class.php |   22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list