diff --git a/docs/upgrades/upgrade_4.8.0-4.9.0.sql b/docs/upgrades/upgrade_4.8.0-4.9.0.sql index d95d06807..59bd648e3 100644 --- a/docs/upgrades/upgrade_4.8.0-4.9.0.sql +++ b/docs/upgrades/upgrade_4.8.0-4.9.0.sql @@ -15,7 +15,16 @@ delete from international where languageId=1 and namespace='FileManager' and int insert into international (internationalId,languageId,namespace,message,lastUpdated) values (61,1,'FileManager','File Manager, Add/Edit', 1038028480); delete from international where languageId=1 and namespace='FileManager' and internationalId=1; insert into international (internationalId,languageId,namespace,message,lastUpdated) values (1,1,'FileManager','File Manager', 1038028463); - +alter table page add column userDefined1 varchar(255); +alter table page add column userDefined2 varchar(255); +alter table page add column userDefined3 varchar(255); +alter table page add column userDefined4 varchar(255); +alter table page add column userDefined5 varchar(255); +alter table discussion add column userDefined1 varchar(255); +alter table discussion add column userDefined2 varchar(255); +alter table discussion add column userDefined3 varchar(255); +alter table discussion add column userDefined4 varchar(255); +alter table discussion add column userDefined5 varchar(255); diff --git a/lib/WebGUI/Discussion.pm b/lib/WebGUI/Discussion.pm index 8b3792622..71d9be771 100644 --- a/lib/WebGUI/Discussion.pm +++ b/lib/WebGUI/Discussion.pm @@ -50,7 +50,9 @@ sub _duplicateReplyTree { $newMessageId = getNextId("messageId"); WebGUI::SQL->write("insert into discussion values ($newMessageId, $_[2], $_[3], $_[1], $data{userId}, " .quote($data{username}).", ".quote($data{subject}).", ".quote($data{message}). - ", $data{dateOfPost}, $_[4], $data{views}, $data{locked}, ".quote($data{status}).")"); + ", $data{dateOfPost}, $_[4], $data{views}, $data{locked}, ".quote($data{status})." + , ".quote($data{userDefined1}).", ".quote($data{userDefined2}).", ".quote($data{userDefined3})." + , ".quote($data{userDefined4}).", ".quote($data{userDefined5}).")"); _duplicateReplyTree($data{messageId},$newMessageId,$_[2],$_[3],$_[4]); } $sth->finish; @@ -147,7 +149,8 @@ sub duplicate { WebGUI::SQL->write("insert into discussion values ($newMessageId, $newMessageId, $_[1], 0, $data{userId}, ".quote($data{username}).", ".quote($data{subject}).", " .quote($data{message}).", $data{dateOfPost}, $newSubId, $data{views}, $data{locked}, - ".quote($data{status}).")"); + ".quote($data{status}).", ".quote($data{userDefined1}).", ".quote($data{userDefined2})." + , ".quote($data{userDefined3}).", ".quote($data{userDefined4}).", ".quote($data{userDefined5}).")"); _duplicateReplyTree($data{messageId},$newMessageId,$newMessageId,$_[1],$newSubId); } $sth->finish; diff --git a/lib/WebGUI/Operation/Package.pm b/lib/WebGUI/Operation/Package.pm index 4420f03b1..eb0c67573 100644 --- a/lib/WebGUI/Operation/Package.pm +++ b/lib/WebGUI/Operation/Package.pm @@ -72,7 +72,12 @@ sub _recursePageTree { templateId, startDate, endDate, - redirectURL + redirectURL, + userDefined1, + userDefined2, + userDefined3, + userDefined4, + userDefined5 ) values ( $newPageId, $_[1], @@ -95,7 +100,12 @@ sub _recursePageTree { ".quote($package{templateId}).", $newParent{startDate}, $newParent{endDate}, - $newParent{redirectURL} + ".quote($newParent{redirectURL}).", + ".quote($newParent{userDefined1}).", + ".quote($newParent{userDefined2}).", + ".quote($newParent{userDefined3}).", + ".quote($newParent{userDefined4}).", + ".quote($newParent{userDefined5})." )"); _recursePageTree($package{pageId},$newPageId); }