From a94567c206be270dbffcd772094b946ccfd32da4 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Mon, 4 Oct 2004 00:06:15 +0000 Subject: [PATCH] preparing for 6.2.7 release --- docs/changelog/6.x.x.txt | 2 ++ docs/create.sql | 2 +- docs/upgrades/upgrade_5.9.9-6.0.0.pl | 10 ++++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 78942c861..917742975 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -7,6 +7,8 @@ - bugfix [ 1038129 ] Error importing with filemanagerimport.pl - bugfix [ 1037605 ] Template changes not saved - bugfix [ 1037531 ] 6.2.6 error (and further back) + - Sped up WebGUI::DateTime::time() calls. + 6.2.6 - Fixed a GUID bug in the Site Map wobject. diff --git a/docs/create.sql b/docs/create.sql index 516b51d53..4fcccd48b 100644 --- a/docs/create.sql +++ b/docs/create.sql @@ -3093,7 +3093,7 @@ CREATE TABLE webguiVersion ( -- -INSERT INTO webguiVersion VALUES ('6.2.6','initial install',unix_timestamp()); +INSERT INTO webguiVersion VALUES ('6.2.7','initial install',unix_timestamp()); -- -- Table structure for table `wobject` diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.pl b/docs/upgrades/upgrade_5.9.9-6.0.0.pl index 8e42d2e5e..1e62572ae 100644 --- a/docs/upgrades/upgrade_5.9.9-6.0.0.pl +++ b/docs/upgrades/upgrade_5.9.9-6.0.0.pl @@ -490,11 +490,12 @@ if ( grep /^FAQ$/i, @tables ){ my $b = WebGUI::SQL->read("select * from FAQ_question where wobjectId=".$data->{wobjectId}); while (my $sub = $b->hashRef) { my $subId = getNextId("USS_submissionId"); - my $forum = WebGUI::Forum->create({}); + my $forumId = getNextId("forumId"); + WebGUI::SQL->write("insert into forum (forumId) values (".$forumId.")"); WebGUI::SQL->write("insert into USS_submission (USS_submissionId, USS_id, title, username, userId, content, dateUpdated, dateSubmitted, forumId,contentType) values ( $subId, $ussId, ".quote($sub->{question}).", ".quote($data->{username}).", ".$data->{ownerId}.", ".quote($sub->{answer}).", ".$data->{lastEdited}.", - ".$data->{dateAdded}.", ".$forum->get("forumId").", 'html')"); + ".$data->{dateAdded}.", ".$forumId.", 'html')"); } $b->finish; } @@ -566,11 +567,12 @@ if ( grep /^LinkList$/i, @tables ){ my $b = WebGUI::SQL->read("select * from LinkList_link where wobjectId=".$data->{wobjectId}); while (my $sub = $b->hashRef) { my $subId = getNextId("USS_submissionId"); - my $forum = WebGUI::Forum->create({}); + my $forumId = getNextId("forumId"); + WebGUI::SQL->write("insert into forum (forumId) values (".$forumId.")"); WebGUI::SQL->write("insert into USS_submission (USS_submissionId, USS_id, title, username, userId, content, dateUpdated, dateSubmitted, forumId,contentType,userDefined1, userDefined2) values ( $subId, $ussId, ".quote($sub->{name}).", ".quote($data->{username}).", ".$data->{ownerId}.", ".quote($sub->{description}).", ".$data->{lastEdited}.", - ".$data->{dateAdded}.", ".$forum->get("forumId").", 'html', ".quote($sub->{url}).", ".quote($sub->{newWindow}).")"); + ".$data->{dateAdded}.", ".$forumId.", 'html', ".quote($sub->{url}).", ".quote($sub->{newWindow}).")"); } $b->finish; }