[Fusionforge-commits] r10776 - trunk/src/common/forum

[Alain Peyrat]

Author: aljeux
Date: 2010-10-01 20:22:43 +0200 (Fri, 01 Oct 2010)
New Revision: 10776

Modified:
   trunk/src/common/forum/Forum.class.php
Log:
Improve error messages when deleting a forum.

Modified: trunk/src/common/forum/Forum.class.php
===================================================================
--- trunk/src/common/forum/Forum.class.php	2010-10-01 18:22:34 UTC (rev 10775)
+++ trunk/src/common/forum/Forum.class.php	2010-10-01 18:22:43 UTC (rev 10776)
@@ -629,16 +629,31 @@
 			return false;
 		}
 		db_begin();
-		db_query_params ('DELETE FROM forum_agg_msg_count WHERE group_forum_id=$1',
+		$result = db_query_params ('DELETE FROM forum_agg_msg_count WHERE group_forum_id=$1',
 				 array ($this->getID())) ;
-//echo '1'.db_error();
-		db_query_params ('DELETE FROM forum_monitored_forums WHERE forum_id=$1',
+		if (!$result) {
+			$this->setError(_('Error Deleting Forum').db_error());
+			db_rollback();
+			return false;
+		}
+
+		$result = db_query_params ('DELETE FROM forum_monitored_forums WHERE forum_id=$1',
 				 array ($this->getID())) ;
-//echo '2'.db_error();
-		db_query_params ('DELETE FROM forum_saved_place WHERE forum_id=$1',
+		if (!$result) {
+			$this->setError(_('Error Deleting Forum').db_error());
+			db_rollback();
+			return false;
+		}
+
+		$result = db_query_params ('DELETE FROM forum_saved_place WHERE forum_id=$1',
 				 array ($this->getID())) ;
-//echo '3'.db_error();
-		db_query_params ('DELETE FROM forum_attachment WHERE msg_id IN (SELECT msg_id from forum where group_forum_id=$1)',
+		if (!$result) {
+			$this->setError(_('Error Deleting Forum').db_error());
+			db_rollback();
+			return false;
+		}
+
+		$result = db_query_params ('DELETE FROM forum_attachment WHERE msg_id IN (SELECT msg_id from forum where group_forum_id=$1)',
 					array ($this->getID())) ;
 		db_query_params ('DELETE FROM forum WHERE group_forum_id=$1',
 				 array ($this->getID())) ;