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 ae25a101f98b05ea2ca146a4ddaf002f2bdfa980 (commit)
via 5ff8c0d99eead6f9ab9cfa3c1266ab38fd84386f (commit)
from e4c6fedc8f1e1866cf74a0439ccfb107d7e68a3d (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=ae25a101f98b05ea2ca146a4ddaf002f2bdfa980
commit ae25a101f98b05ea2ca146a4ddaf002f2bdfa980
Author: Franck Villaume <[email protected]>
Date: Sat Jan 30 17:32:12 2016 +0100
rss: use rss2.0 for projects, remove duplicate rss 0.91 news, fix rss
activity when group_id is 0
diff --git a/src/common/include/Navigation.class.php
b/src/common/include/Navigation.class.php
index cfdff3b..d99c0f7 100644
--- a/src/common/include/Navigation.class.php
+++ b/src/common/include/Navigation.class.php
@@ -103,15 +103,12 @@ class Navigation extends Error {
$res['urls'] = array();
$res['titles'][] = forge_get_config ('forge_name').' -
Project News Highlights RSS';
- $res['urls'][] =
util_make_uri('/export/rss_sfnews.php');
-
- $res['titles'][] = forge_get_config ('forge_name').' -
Project News Highlights RSS 2.0';
$res['urls'][] =
util_make_uri('/export/rss20_news.php');
$res['titles'][] = forge_get_config ('forge_name').' -
New Projects RSS';
- $res['urls'][] =
util_make_uri('/export/rss_sfprojects.php');
+ $res['urls'][] =
util_make_uri('/export/rss20_projects.php');
- if (isset($GLOBALS['group_id'])) {
+ if (isset($GLOBALS['group_id']) && $GLOBALS['group_id']
> 0) {
$res['titles'][] = forge_get_config
('forge_name') . ' - New Activity RSS';
$res['urls'][] =
util_make_uri('/export/rss20_activity.php?group_id='.$GLOBALS['group_id']);
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5ff8c0d99eead6f9ab9cfa3c1266ab38fd84386f
commit 5ff8c0d99eead6f9ab9cfa3c1266ab38fd84386f
Author: Franck Villaume <[email protected]>
Date: Sat Jan 30 17:28:42 2016 +0100
rss: fix label, use proper SQL query to filter groups
diff --git a/src/www/export/rss20_projects.php
b/src/www/export/rss20_projects.php
index 9274343..37f37b9 100644
--- a/src/www/export/rss20_projects.php
+++ b/src/www/export/rss20_projects.php
@@ -31,10 +31,12 @@ print '<?xml version="1.0" encoding="UTF-8"?>
$limit = getIntFromRequest('limit', 10);
-$res = db_query_params('SELECT
group_id,group_name,unix_group_name,homepage,short_description,register_time
FROM groups WHERE status=$1 ORDER BY group_id',
+$res = db_query_params('SELECT
group_id,group_name,unix_group_name,homepage,short_description,register_time
FROM groups
+ WHERE status = $1 AND type_id=1 AND is_template=0 AND
register_time > 0
+ ORDER BY register_time DESC',
array ('A'),
$limit);
-rss_dump_project_result_set($res,forge_get_config ('forge_name')._(':
')._('Full Project Listing'));
+rss_dump_project_result_set($res,forge_get_config ('forge_name')._(':
')._('New Projects Listing'));
?>
</rss>
-----------------------------------------------------------------------
Summary of changes:
src/common/include/Navigation.class.php | 7 ++-----
src/www/export/rss20_projects.php | 6 ++++--
2 files changed, 6 insertions(+), 7 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
