[Fusionforge-commits] FusionForge branch master updated. v6.0.2-250-g0dacd1c

Franck Villaume nerville at libremir.placard.fr.eu.org
Sat Sep 19 15:16:31 CEST 2015


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  0dacd1c2a29464b4f1df9c956960101063356db5 (commit)
      from  25e3cb5d778ef50218648dd52df966d2d5f5c7b3 (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=0dacd1c2a29464b4f1df9c956960101063356db5

commit 0dacd1c2a29464b4f1df9c956960101063356db5
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sat Sep 19 15:16:12 2015 +0200

    fix pending-news: url vs. PHP_SELF

diff --git a/src/www/admin/pending-news.php b/src/www/admin/pending-news.php
index e23ffdf..8f31efb 100644
--- a/src/www/admin/pending-news.php
+++ b/src/www/admin/pending-news.php
@@ -197,7 +197,8 @@ AND news_bytes.group_id=groups.group_id ", array($id));
 	show_news_approve_form(
 		$qpa_pending,
 		$qpa_rejected,
-		$qpa_approved
+		$qpa_approved,
+		'/admin/pending-news.php'
 		);
 
 }
diff --git a/src/www/news/admin/news_admin_utils.php b/src/www/news/admin/news_admin_utils.php
index 9de08e3..ded00a2 100644
--- a/src/www/news/admin/news_admin_utils.php
+++ b/src/www/news/admin/news_admin_utils.php
@@ -24,7 +24,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-function show_news_approve_form($qpa_pending, $qpa_rejected, $qpa_approved) {
+function show_news_approve_form($qpa_pending, $qpa_rejected, $qpa_approved, $form_url) {
 	/*
 		Show list of waiting news items
 	*/
@@ -33,7 +33,7 @@ function show_news_approve_form($qpa_pending, $qpa_rejected, $qpa_approved) {
 
 	// function to show single news item
 	// factored out because called 3 time below
-	function show_news_item($row, $i, $approved, $selectable) {
+	function show_news_item($row, $i, $approved, $selectable, $form_url) {
 		global $HTML;
 
 		echo '<tr '. $HTML->boxGetAltRowStyle($i) . '><td>';
@@ -44,7 +44,7 @@ function show_news_approve_form($qpa_pending, $qpa_rejected, $qpa_approved) {
 		}
 		echo date(_('Y-m-d'), $row['post_date']).'</td>
 		<td width="45%">';
-		echo util_make_link('/news/admin/?approve=1&id='.$row['id'].'&group_id='.$row['group_id'], $row['summary']);
+		echo util_make_link($form_url.'?approve=1&id='.$row['id'], $row['summary']);
 		echo '</td>
 
 		<td class="onethirdwidth">'
@@ -80,7 +80,7 @@ function show_news_approve_form($qpa_pending, $qpa_rejected, $qpa_approved) {
 		echo '<h2>'.sprintf(_('These items need to be approved (total: %d)'), $rows).'</h2>';
 		echo $HTML->listTableTop($title_arr);
 		for ($i=0; $i < $rows; $i++) {
-			show_news_item($items[$i], $i, false,true);
+			show_news_item($items[$i], $i, false,true, $form_url);
 		}
 		echo $HTML->listTableBottom();
 		echo '<br /><input type="submit" name="submit" value="'._('Reject Selected').'" />';

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

Summary of changes:
 src/www/admin/pending-news.php          | 3 ++-
 src/www/news/admin/news_admin_utils.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list