[evolvis-commits] r7404: Solved conflicts arising from 2.6 import/merge. [CB] ↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Feb 24 15:40:13 CET 2011


Author: mirabilos
Date: 2011-02-24 15:40:13 +0100 (Thu, 24 Feb 2011)
New Revision: 7404

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/www/news/index.php
Log:
Solved conflicts arising from 2.6 import/merge. [CB]


Modified: trunk/gforge_base/evolvisforge-5.1/gforge/www/news/index.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/www/news/index.php	2011-02-24 14:40:11 UTC (rev 7403)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/www/news/index.php	2011-02-24 14:40:13 UTC (rev 7404)
@@ -1,23 +1,23 @@
 <?php
-//
-// SourceForge: Breaking Down the Barriers to Open Source Development
-// Copyright 1999-2000 (c) The SourceForge Crew
-// http://sourceforge.net
-//
-// $Id$
+/**
+  *
+  * SourceForge News Facility
+  *
+  * SourceForge: Breaking Down the Barriers to Open Source Development
+  * Copyright 1999-2001 (c) VA Linux Systems
+  * http://sourceforge.net
+  *
+  * @version   $Id$
+  *
+  */
 
-require('pre.php');
-require('../forum/forum_utils.php');
 
-global $group_id;
+require_once('pre.php');
+require_once('www/forum/forum_utils.php');
 
-if (!$group_id) {
-	$group_id = $GLOBALS['sys_news_group'];
-}
+news_header(array('title'=>'News','pagename'=>'news','sectionvals'=>array(group_getname($group_id))));
 
-news_header(array('title'=>'News'));
-
-echo '<H3>News</H3>
+echo '
 	<P>Choose a News item and you can browse, search, and post messages.<P>';
 
 /*



More information about the evolvis-commits mailing list