[Fusionforge-commits] r7694 - in trunk: . gforge/common/include gforge/plugins/wiki gforge/www/export

Roland Mas lolando at libremir.placard.fr.eu.org
Tue May 19 11:00:10 CEST 2009


Author: lolando
Date: 2009-05-19 11:00:09 +0200 (Tue, 19 May 2009)
New Revision: 7694

Modified:
   trunk/
   trunk/gforge/common/include/FusionForge.class.php
   trunk/gforge/plugins/wiki/README
   trunk/gforge/www/export/rss20_news.php
Log:
Merged from 4.8: SQL query syntax


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7477,7478,7480,7485,7490-7491,7492,7505,7540,7556-7558,7559-7560,7568,7570-7571,7573,7576,7580,7609-7610,7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685

   + /branches/Branch_4_7:6879,6881,6884,6897,6899,6902,6904,6906,6909,6911,6922,6932,6936,6939,6942,6944,6946-6948,6954,6956,6959,7000-7001,7012,7111,7130-7131,7133-7134,7138,7140-7142,7147-7148,7159-7160,7163,7168,7177,7179,7203,7205,7207,7210,7212,7251-7253,7255,7284,7287,7291,7293,7295-7296,7300,7355,7365-7366,7375-7376,7378,7395,7423-7426,7435,7458,7504,7567,7577,7623-7624,7638,7659-7660,7662,7665,7668,7674
/branches/Branch_4_8:7334-7335,7344-7345,7382,7387,7389-7390,7396,7398,7401-7402,7428-7429,7437,7440,7443,7449-7455,7459,7462,7466,7469-7470,7476-7477,7478,7480,7485,7490-7491,7492,7505,7540,7556-7558,7559-7560,7568,7570-7571,7573,7576,7580,7609-7610,7611,7613,7615,7618,7621-7622,7625-7627,7639,7658,7661,7663-7664,7666-7667,7673,7675,7678,7680,7685,7688-7689,7693


Modified: trunk/gforge/www/export/rss20_news.php
===================================================================
--- trunk/gforge/www/export/rss20_news.php	2009-05-19 08:57:23 UTC (rev 7693)
+++ trunk/gforge/www/export/rss20_news.php	2009-05-19 09:00:09 UTC (rev 7694)
@@ -16,7 +16,7 @@
 if ($limit > 100) $limit = 100;
 
 if ($group_id) {
-	$where = "AND group_id=$group_id";
+	$where = "AND g.group_id=$group_id";
 	$query = "SELECT group_name FROM groups WHERE group_id=$group_id";
 	$res = db_query($query,1);
 	$row = db_fetch_array($res);




More information about the Fusionforge-commits mailing list