From 205b2c3b5e0bc8c521bc9450fb0fadf51a617143 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Tue, 25 May 2004 19:46:01 +0000
Subject: [PATCH] bugfix [ 947141 ] Bug in Forum - No Subject!!!

---
 docs/changelog/6.x.x.txt              | 4 ++++
 docs/upgrades/upgrade_6.0.2-6.0.3.sql | 4 +++-
 lib/WebGUI/Forum.pm                   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 29d61f183..4a13840f9 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -8,6 +8,10 @@
    form-parameters
  - Bugfix [ 956221 ] article template
  - Bugfix [ 952906 ] Terminology in the Layout page
+ - Bugfix [ 952374 ] Images in Articel doesn't work anymore
+ - Bugfix [ 952137 ] error deleting default content after install
+ - Bugfix [ 947141 ] Bug in Forum - No Subject!!!
+
 
 
 
diff --git a/docs/upgrades/upgrade_6.0.2-6.0.3.sql b/docs/upgrades/upgrade_6.0.2-6.0.3.sql
index e43adf3d1..3685e2dc0 100644
--- a/docs/upgrades/upgrade_6.0.2-6.0.3.sql
+++ b/docs/upgrades/upgrade_6.0.2-6.0.3.sql
@@ -1,4 +1,6 @@
 insert into webguiVersion values ('6.0.3','upgrade',unix_timestamp());
-delete from international where internationId=981 and namespace='WebGUI';
+delete from international where internationalId=981 and namespace='WebGUI';
 INSERT INTO international VALUES (981,'WebGUI',1,'Manage database links.',1056151382,NULL);
+delete from replacements where replacementId=0;
+
 
diff --git a/lib/WebGUI/Forum.pm b/lib/WebGUI/Forum.pm
index 383639864..2a8eaf307 100644
--- a/lib/WebGUI/Forum.pm
+++ b/lib/WebGUI/Forum.pm
@@ -383,6 +383,7 @@ Destroys this forum and everything it contains.
 
 sub purge {
 	my ($self) = @_;
+	return unless ($self->get("forumId"));
 	my $a = WebGUI::SQL->read("select * from forumThread where forumId=".$self->get("forumId"));
 	while (my ($threadId) = $a->array) {
 		my $b = WebGUI::SQL->read("select * from forumPost where forumThreadId=".$threadId);