From e945c3100dae394e6644f1364a6fcf3ee9dfe236 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Thu, 1 Jan 2004 23:54:23 +0000 Subject: [PATCH] merging 5.5.4 changes --- docs/changelog/5.x.x.txt | 23 +- docs/upgrades/upgrade_5.5.3-5.5.4.sql | 2 + docs/upgrades/upgrade_5.9.9-6.0.0.pl | 489 ++++++++++++++++++ ....5.3-6.0.0.sql => upgrade_5.9.9-6.0.0.sql} | 0 lib/WebGUI/Wobject.pm | 2 +- 5 files changed, 514 insertions(+), 2 deletions(-) create mode 100644 docs/upgrades/upgrade_5.5.3-5.5.4.sql create mode 100644 docs/upgrades/upgrade_5.9.9-6.0.0.pl rename docs/upgrades/{upgrade_5.5.3-6.0.0.sql => upgrade_5.9.9-6.0.0.sql} (100%) diff --git a/docs/changelog/5.x.x.txt b/docs/changelog/5.x.x.txt index f10c27373..c3c17b2f0 100644 --- a/docs/changelog/5.x.x.txt +++ b/docs/changelog/5.x.x.txt @@ -1,6 +1,27 @@ 5.5.4 - Bugfix [ 849210 ] Login Redirect should filter out the "logout" operation - - Bugfix [ 852024 ] Can't copy a USS wobject + - Bugfix 859816 : DataForm - security issues. Tnx Gabor for reporting. + - ^t; now starts in current root rather then in site root. + - Bugfix [ 867047 ] cannot delete Redirect URL. Thanks to Klaus Hertle. + - Bugfix [ 864535 ] Secondary admin adds user to group + - Bugfix [ 864537 ] Secondary admin adds user to group #2 + - Bugfix [ 859199 ] Login problem + - Bugfix [ 852930 ] Pieces of Collateral Statistic always zero. Thanks to ajaman. + - Bugfix [ 854124 ] Can't reply to discussion message for USS submission. + - Fixed a bug in form processor that caused legal email addy's with funny + characters to fail the check. + - Bugfix [ 855228 ] word wrap not working when posting as text + - Bugfix [ 855632 ] SyndicatedContent crashs when rss contains only one item + (Thanks to Len Kranendonk) + - Bugfix [ 855682 ] USS rss feed shows unapproved items + - Bugfix [ 855684 ] USS: no approvement check + - Bugfix [ 826864 ] Endless recursion + - Bugfix [ 855968 ] search shows deleted messages + - Fixed a bug that wouldn't allow urls like ldap://some.server and + https://some.server to work in a url field + - Bugfix [ 852024 ] Can't copy a USS wobject (Thanks to Len Kranendonk) + - Bugfix [ 849438 ] Adding Wobject Fails for Content Managers + 5.5.3 - Lowercase file extension in importCollateral.pl while determinating file diff --git a/docs/upgrades/upgrade_5.5.3-5.5.4.sql b/docs/upgrades/upgrade_5.5.3-5.5.4.sql new file mode 100644 index 000000000..48775ece3 --- /dev/null +++ b/docs/upgrades/upgrade_5.5.3-5.5.4.sql @@ -0,0 +1,2 @@ +insert into webguiVersion values ('5.5.4','upgrade',unix_timestamp()); + diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.pl b/docs/upgrades/upgrade_5.9.9-6.0.0.pl new file mode 100644 index 000000000..9e360d981 --- /dev/null +++ b/docs/upgrades/upgrade_5.9.9-6.0.0.pl @@ -0,0 +1,489 @@ +#!/usr/bin/perl + +use lib "../../lib"; +use Getopt::Long; +use Parse::PlainConfig; +use strict; +use WebGUI::Session; +use WebGUI::SQL; +use WebGUI::Forum; + +my $configFile; +my $quiet; +GetOptions( + 'configFile=s'=>\$configFile, + 'quiet'=>\$quiet +); +WebGUI::Session::open("../..",$configFile); + + +#-------------------------------------------- +print "\tMigrating styles.\n" unless ($quiet); +my $sth = WebGUI::SQL->read("select * from style"); +while (my $style = $sth->hashRef) { + my ($header,$footer) = split(/\^\-\;/,$style->{body}); + my ($newStyleId) = WebGUI::SQL->quickArray("select max(templateId) from template where namespace='style'"); + if ($style->{styleId} > 0 && $style->{styleId} < 25) { + $newStyleId = $style->{styleId}; + } elsif ($newStyleId > 999) { + $newStyleId++; + } else { + $newStyleId = 1000; + } + my $newStyle = $session{setting}{docTypeDec}.' + + + <tmpl_var session.page.title> - <tmpl_var session.setting.companyName> + + '.$style->{styleSheet}.' + + '.$header.' + + '.$footer.' + + '; + WebGUI::SQL->write("insert into template (templateId, name, template, namespace) values (".$newStyleId.", + ".quote($style->{name}).", ".quote($newStyle).", 'style')"); + WebGUI::SQL->write("update page set styleId=".$newStyleId." where styleId=".$style->{styleId}); + WebGUI::SQL->write("update themeComponent set id=".$newStyleId.", type='template' where id=".$style->{styleId}." and type='style'"); +} +$sth->finish; +WebGUI::SQL->write("delete from incrementer where incrementerId='styleId'"); +WebGUI::SQL->write("delete from settings where name='docTypeDec'"); +WebGUI::SQL->write("drop table style"); +my @templateManagers = WebGUI::SQL->buildArray("select userId from groupings where groupId=8"); +my $clause; +if ($#templateManagers > 0) { + $clause = "and userId not in (".join(",",@templateManagers).")"; +} +$sth = WebGUI::SQL->read("select userId,expireDate,groupAdmin from groupings where groupId=5 ".$clause); +while (my $user = $sth->hashRef) { + WebGUI::SQL->write("insert into groupings (groupId,userId,expireDate,groupAdmin) values (8, ".$user->{userId}.", + ".$user->{expireDate}.", ".$user->{groupAdmin}.")"); +} +$sth->finish; +WebGUI::SQL->write("delete from groups where groupId=5"); +WebGUI::SQL->write("delete from groupings where groupId=5"); + + +#-------------------------------------------- +print "\tMigrating extra columns to page templates.\n" unless ($quiet); +my $a = WebGUI::SQL->read("select a.wobjectId, a.templatePosition, a.sequenceNumber, a.pageId, b.templateId, c.width, c.class, c.spacer from wobject a + left join page b on a.pageId=b.pageId left join ExtraColumn c on a.wobjectId=c.wobjectId where a.namespace='ExtraColumn'"); +while (my $data = $a->hashRef) { + my ($template, $name) = WebGUI::SQL->quickArray("select template,name from template where namespace='Page' and templateId=".$data->{templateId}); + $name .= " w/ Extra Column"; + #eliminate the need for compatibility with old-style page templates + $template =~ s/\^(\d+)\;/_positionFormat5x($1)/eg; + my $i = 1; + while ($template =~ m/page\.position$i/) { + $i++; + } + my $position = $i; + my $replacement = '{templatePosition}.'>'; + my $spliton = "{templatePosition}.">"; + my @parts = split(/$spliton/, $template); + $template = $parts[0].$replacement.$parts[1]; + my ($id) = WebGUI::SQL->quickArray("select max(templateId) from template where namespace='Page'"); + $id++; + WebGUI::SQL->write("insert into template (templateId, name, template, namespace) values ($id, ".quote($name).", ".quote($template).", 'Page')"); + WebGUI::SQL->write("update page set templateId=$id where pageId=".$data->{pageId}); + WebGUI::SQL->write("update wobject set templatePosition=".$position." where pageId=".$data->{pageId}." and templatePosition=". + $data->{templatePosition}." and sequenceNumber>".$data->{sequenceNumber}); + WebGUI::SQL->write("delete from wobject where wobjectId=".$data->{wobjectId}); + my $b = WebGUI::SQL->read("select wobjectId from wobject where pageId=".$data->{pageId}." order by templatePosition,sequenceNumber"); + my $i = 0; + while (my ($wid) = $b->array) { + $i++; + WebGUI::SQL->write("update wobject set sequenceNumber='$i' where wobjectId=$wid"); + } + $b->finish; +} +$a->finish; +WebGUI::SQL->write("drop table ExtraColumn"); + + +#-------------------------------------------- +print "\tMigrating page templates.\n" unless ($quiet); +my $sth = WebGUI::SQL->read("select * from template where namespace='Page'"); +while (my $template = $sth->hashRef) { + #eliminate the need for compatibility with old-style page templates + $template->{template} =~ s/\^(\d+)\;/_positionFormat5x($1)/eg; + $template->{template} = ' + + + + + + + '.$template->{template}; + $template->{template} =~ s/\/_positionFormat6x($1)/eg; + WebGUI::SQL->write("update template set namespace='page', template=".quote($template->{template}) + ." where templateId=".$template->{templateId}." and namespace='Page'"); +} +$sth->finish; + +#-------------------------------------------- +print "\tConverting items into articles.\n" unless ($quiet); +my $sth = WebGUI::SQL->read("select * from template where namespace='Item'"); +while (my $template = $sth->hashRef) { + $template->{name} =~ s/Default (.*?)/$1/i; + if ($template->{templateId} < 1000) { + ($template->{templateId}) = WebGUI::SQL->quickArray("select max(templateId) from template where namespace='Article' and templateId<1000"); + $template->{templateId}++; + } else { + ($template->{templateId}) = WebGUI::SQL->quickArray("select max(templateId) from template where namespace='Article'"); + if ($template->{templateId} > 999) { + $template->{templateId}++; + } else { + $template->{templateId} = 1000; + } + } + WebGUI::SQL->write("insert into template (templateId,name,template,namespace) values (".$template->{templateId}.", + ".quote($template->{name}).", ".quote($template->{template}).", 'Article')"); +} +$sth->finish; +WebGUI::SQL->write("delete from template where namespace='Item'"); +WebGUI::SQL->write("update wobject set namespace='Article' where namespace='Item'"); +my $sth = WebGUI::SQL->read("select * from Item"); +while (my $data = $sth->hashRef) { + WebGUI::SQL->write("insert into Article (wobjectId,linkURL,attachment) values (".$data->{wobjectId}.", + ".quote($data->{linkURL}).", ".quote($data->{attachment}).")"); +} +$sth->finish; +WebGUI::SQL->write("drop table Item"); + + +#-------------------------------------------- +print "\tSequencing user submissions.\n" unless ($quiet); +WebGUI::SQL->write("alter table USS_submission add column sequenceNumber int not null"); +WebGUI::SQL->write("alter table USS add column USS_id int not null"); +WebGUI::SQL->write("alter table USS_submission add column USS_id int not null"); +my $ussId = 1000; +my $a = WebGUI::SQL->read("select wobjectId from USS"); +while (my ($wobjectId) = $a->array) { + WebGUI::SQL->write("update USS set USS_id=$ussId where wobjectId=$wobjectId"); + my $b = WebGUI::SQL->read("select USS_submissionId from USS_submission where wobjectId=$wobjectId order by dateSubmitted"); + my $seq = 1; + while (my ($subId) = $b->array) { + WebGUI::SQL->write("update USS_submission set sequenceNumber=$seq, USS_id=$ussId where USS_submissionId=$subId"); + $seq++; + } + $b->finsih; + $ussId++; +} +$a->finish; +WebGUI::SQL->write("alter table USS_submission drop column wobjectId"); +WebGUI::SQL->write("alter table USS add column submissionFormTemplateId int not null default 1"); +WebGUI::SQL->write("alter table USS_submission add column contentType varchar(35) not null default 'mixed'"); +WebGUI::SQL->write("update USS_submission set contentType='html' where convertCarriageReturns=0"); +WebGUI::SQL->write("alter table USS_submission drop column convertCarriageReturns"); +WebGUI::SQL->write("insert into incrementer (incrementerId,nextValue) values ('USS_id',$ussId)"); +WebGUI::SQL->write("alter table USS_submission add column userDefined1 text"); +WebGUI::SQL->write("alter table USS_submission add column userDefined2 text"); +WebGUI::SQL->write("alter table USS_submission add column userDefined3 text"); +WebGUI::SQL->write("alter table USS_submission add column userDefined4 text"); +WebGUI::SQL->write("alter table USS_submission add column userDefined5 text"); + + +#-------------------------------------------- +print "\tConverting FAQs into USS Submissions.\n" unless ($quiet); +my $sth = WebGUI::SQL->read("select * from template where namespace='FAQ'"); +while (my $template = $sth->hashRef) { + $template->{name} =~ s/Default (.*?)/$1/i; + if ($template->{templateId} < 1000) { + ($template->{templateId}) = WebGUI::SQL->quickArray("select max(templateId) from template where namespace='USS' and templateId<1000"); + $template->{templateId}++; + } else { + ($template->{templateId}) = WebGUI::SQL->quickArray("select max(templateId) from template where namespace='USS'"); + if ($template->{templateId} > 999) { + $template->{templateId}++; + } else { + $template->{templateId} = 1000; + } + } + $template->{template} =~ s/\/\/igs; + my $replacement = ' + + [] + + + + + '; + $template->{template} =~ s/\\s*\\s*\<\/tmpl_if\>/$replacement/igs; + $replacement = ' + '; + $template->{template} =~ s/\\s*\"\>/$replacement/igs; + $template->{template} =~ s/\/\/igs; + $template->{template} =~ s/\/\/igs; + $template->{template} =~ s/\/\/igs; + WebGUI::SQL->write("insert into template (templateId,name,template,namespace) values (".$template->{templateId}.", + ".quote($template->{name}).", ".quote($template->{template}).", 'USS')"); +} +$sth->finish; +WebGUI::SQL->write("delete from template where namespace='FAQ'"); +my $a = WebGUI::SQL->read("select a.wobjectId,a.groupIdEdit,a.ownerId,a.lastEdited,b.username,a.dateAdded from wobject a left join users b on + a.ownerId=b.userId where a.namespace='FAQ'"); +while (my $data = $a->hashRef) { + $ussId = getNextId("USS_id"); + WebGUI::SQL->write("insert into USS (wobjectId, USS_id, groupToContribute, submissionsPerPage, filterContent, sortBy, sortOrder, + submissionFormTemplateId) values ( + ".$data->{wobjectId}.", $ussId, ".$data->{groupIdEdit}.", 1000, 'none', 'sequenceNumber', 'asc', 2)"); + my $b = WebGUI::SQL->read("select * from FAQ_question"); + while (my $sub = $b->hashRef) { + my $subId = getNextId("USS_submissionId"); + my $forum = WebGUI::Forum->create({}); + WebGUI::SQL->write("insert into USS_submission (USS_submissionId, USS_id, title, username, userId, content, + dateUpdated, dateSubmited, forumId,contentType) values ( $subId, $ussId, ".quote($sub->{question}).", + ".quote($data->{username}).", ".$data->{ownerId}.", ".quote($sub->{answer}).", ".$data->{lastEdited}.", + ".$data->{dateAdded}.", ".$forum->get("forumId").", 'html')"); + } + $b->finish; +} +$a->finish; +WebGUI::SQL->write("update wobject set namespace='USS' where namespace='FAQ'"); +WebGUI::SQL->write("drop table FAQ"); +WebGUI::SQL->write("drop table FAQ_question"); +WebGUI::SQL->write("delete from incrementer where incrementerId='FAQ_questionId'"); + + +#-------------------------------------------- +print "\tMigrating Link Lists to USS Submissions.\n" unless ($quiet); +my $sth = WebGUI::SQL->read("select * from template where namespace='LinkList'"); +while (my $template = $sth->hashRef) { + $template->{name} =~ s/Default (.*?)/$1/i; + if ($template->{templateId} < 1000) { + ($template->{templateId}) = WebGUI::SQL->quickArray("select max(templateId) from template where namespace='USS' and templateId<1000"); + $template->{templateId}++; + } else { + ($template->{templateId}) = WebGUI::SQL->quickArray("select max(templateId) from template where namespace='USS'"); + if ($template->{templateId} > 999) { + $template->{templateId}++; + } else { + $template->{templateId} = 1000; + } + } + $template->{template} =~ s/\/\/igs; + $template->{template} =~ s/\//igs; + $template->{template} =~ s/\<\/tmpl\_if\>\s*\<\/tmpl\_if\>/\<\/tmpl_if>/igs; + my $replacement = ' + + [] + + + + '; + $template->{template} =~ s/\\s*\\s*/$replacement/igs; + $replacement = ' + '; + $template->{template} =~ s/\\s*\"\>/$replacement/igs; + $template->{template} =~ s/\/\/igs; + $template->{template} =~ s/\/\/igs; + $template->{template} =~ s/\/\/igs; + $template->{template} =~ s/\/\/igs; + $template->{template} =~ s/\/\/igs; + $template->{template} =~ s/\/\/igs; + WebGUI::SQL->write("insert into template (templateId,name,template,namespace) values (".$template->{templateId}.", + ".quote($template->{name}).", ".quote($template->{template}).", 'USS')"); +} +$sth->finish; +WebGUI::SQL->write("delete from template where namespace='LinkList'"); +my $a = WebGUI::SQL->read("select a.wobjectId,a.groupIdEdit,a.ownerId,a.lastEdited,b.username,a.dateAdded from wobject a left join users b on + a.ownerId=b.userId where a.namespace='LinkList'"); +while (my $data = $a->hashRef) { + $ussId = getNextId("USS_id"); + WebGUI::SQL->write("insert into USS (wobjectId, USS_id, groupToContribute, submissionsPerPage, filterContent, sortBy, sortOrder, + submissionFormTemplateId) values ( + ".$data->{wobjectId}.", $ussId, ".$data->{groupIdEdit}.", 1000, 'none', 'sequenceNumber', 'asc', 3)"); + my $b = WebGUI::SQL->read("select * from LinkList_link"); + while (my $sub = $b->hashRef) { + my $subId = getNextId("USS_submissionId"); + my $forum = WebGUI::Forum->create({}); + WebGUI::SQL->write("insert into USS_submission (USS_submissionId, USS_id, title, username, userId, content, + dateUpdated, dateSubmited, 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}).")"); + } + $b->finish; +} +$a->finish; +WebGUI::SQL->write("update wobject set namespace='USS' where namespace='LinkList'"); +WebGUI::SQL->write("drop table LinkList"); +WebGUI::SQL->write("drop table LinkList_link"); +WebGUI::SQL->write("delete from incrementer where incrementerId='LinkList_linkId'"); + + + +#-------------------------------------------- +print "\tUpdating SQL Reports.\n" unless ($quiet); +my %dblink; +$dblink{$session{config}{dsn}} = ( + id=>0, + user=>$session{config}{dbuser} + ); +my $sth = WebGUI::SQL->read("select DSN, databaseLinkId, username, identifier, wobjectId from SQLReport"); +while (my $data = $sth->hashRef) { + my $id = undef; + next if ($data->{databaseLinkId} > 0); + foreach my $dsn (keys %dblink) { + if ($dsn eq $data->{dsn} && $dblink{$dsn}{user} eq $data->{username}) { + $id = $dblink{$dsn}{id}; + last; + } + } + unless (defined $id) { + $id = getNextId("databaseLinkId"); + my $title = $data->{username}.'@'.$data->{DSN}; + WebGUI::SQL->write("insert into databaseLink (databaseLinkId, title, DSN, username, identifier) values ($id, ".quote($title).", + ".quote($data->{DSN}).", ".quote($data->{username}).", ".quote($data->{identifier}).")"); + $dblink{$data->{DSN}} = ( + id=>$id, + user=>$data->{username} + ); + } + WebGUI::SQL->write("update SQLReport set databaseLinkId=".$id." where wobjectId=".$data->{wobjectId}); +} +$sth->finish; +WebGUI::SQL->write("alter table SQLReport drop column DSN"); +WebGUI::SQL->write("alter table SQLReport drop column username"); +WebGUI::SQL->write("alter table SQLReport drop column identifier"); +use WebGUI::DatabaseLink; +my $templateId; +my $a = WebGUI::SQL->read("select a.databaseLinkId, a.dbQuery, a.template, a.wobjectId, b.title from SQLReport a + left join wobject b on a.wobjectId=b.wobjectId"); +while (my $data = $a->hashRef) { + my $db = WebGUI::DatabaseLink->new($data->{databaseLinkId}); + if ($data->{template} ne "") { + ($templateId) = WebGUI::SQL->quickArray("select max(templateId) from template where namespace='SQLReport'"); + if ($templateId > 999) { + $templateId++; + } else { + $templateId = 1000; + } + my $b = WebGUI::SQL->unconditionalRead($data->{dbQuery},$db->dbh); + my @template = split(/\^\-\;/,$data->{template}); + my $final = ' +

+ + + +

+ + + +

    + +
    • +     +
+ + '.$template[0].' + '; + my $i; + foreach my $col ($b->getColumnNames) { + my $replacement = ''; + $template[1] =~ s/\^$i\;/$replacement/g; + $i++; + } + $template[1] =~ s/\^rownum\;/\/g; + $final .= $template[1].' + + '.$template[2].' + + + '; + WebGUI::SQL->write("insert into template (templateId, name, template, namespace) values ($templateId, + ".quote($data->{title}).",".quote($final).",'SQLReport')"); + } else { + $templateId = 1; + } + WebGUI::SQL->write("insert into wobject set templateId=$templateId where wobjectId=".$data->{wobjectId}); +} +$a->finish; +WebGUI::SQL->write("alter table SQLReport drop column template"); + + + +#-------------------------------------------- +print "\tUpdating config file.\n" unless ($quiet); +my $pathToConfig = '../../etc/'.$configFile; +my $conf = Parse::PlainConfig->new('DELIM' => '=', 'FILE' => $pathToConfig); +my $macros = $conf->get("macros"); +delete $macros->{"\\"}; +$macros->{"\\\\"} = "Backslash_pageUrl"; +$conf->set("macros"=>$macros); +my $wobjects = $conf->get("wobjects"); +my @newWobjects; +foreach my $wobject (@{$wobjects}) { + unless ($wobject eq "Item" || $wobject eq "FAQ" || $wobject eq "ExtraColumn" || $wobject eq "LinkList") { + push(@newWobjects,$wobject); + } +} +$conf->set("wobjects"=>\@newWobjects); +$conf->write; + + +#-------------------------------------------- +print "\tUpdating Authentication.\n" unless ($quiet); +WebGUI::SQL->write("delete from authentication where authMethod='WebGUI' and fieldName='passwordLastUpdated'"); +WebGUI::SQL->write("delete from authentication where authMethod='WebGUI' and fieldName='passwordTimeout'"); +my $authSth = WebGUI::SQL->read("select userId from users where authMethod='WebGUI'"); +while (my $authHash = $authSth->hashRef){ + WebGUI::SQL->write("insert into authentication (userId,authMethod,fieldName,fieldData) values ('".$authHash->{userId}."','WebGUI','passwordLastUpdated','".time()."')"); + WebGUI::SQL->write("insert into authentication (userId,authMethod,fieldName,fieldData) values ('".$authHash->{userId}."','WebGUI','passwordTimeout','3122064000')"); +} + + +#-------------------------------------------- +print "\tRemoving unneeded files and directories.\n" unless ($quiet); +unlink("../../lib/WebGUI/Operation/Style.pm"); +unlink("../../lib/WebGUI/Wobject/Item.pm"); +unlink("../../lib/WebGUI/Wobject/LinkList.pm"); +unlink("../../lib/WebGUI/Wobject/FAQ.pm"); +unlink("../../lib/WebGUI/Wobject/ExtraColumn.pm"); +unlink("../../lib/WebGUI/Authentication.pm"); +unlink("../../lib/WebGUI/Operation/Account.pm"); +unlink("../../lib/WebGUI/Authentication/WebGUI.pm"); +unlink("../../lib/WebGUI/Authentication/LDAP.pm"); +unlink("../../lib/WebGUI/Authentication/SMB.pm"); +rmdir("../../lib/WebGUI/Authentication"); +WebGUI::Session::close(); + + +#------------------------------------------------------------------- +sub _positionFormat5x { + return ""; +} + +#------------------------------------------------------------------- +sub _positionFormat6x { + my $newPositionCode = ' + + +
+ + + '; + return $newPositionCode; +} + + diff --git a/docs/upgrades/upgrade_5.5.3-6.0.0.sql b/docs/upgrades/upgrade_5.9.9-6.0.0.sql similarity index 100% rename from docs/upgrades/upgrade_5.5.3-6.0.0.sql rename to docs/upgrades/upgrade_5.9.9-6.0.0.sql diff --git a/lib/WebGUI/Wobject.pm b/lib/WebGUI/Wobject.pm index 61c4583db..2eb240fb5 100644 --- a/lib/WebGUI/Wobject.pm +++ b/lib/WebGUI/Wobject.pm @@ -1255,7 +1255,7 @@ sub www_edit { push (@$contentManagers, $session{user}{userId}); $clause = "userId in (".join(",",@$contentManagers).")"; } else { - $clause = "userId=".$_[0]->get("ownerId"); + $clause = "userId=".$_[0]->getValue("ownerId"); } my $users = WebGUI::SQL->buildHashRef("select userId,username from users where $clause order by username"); $f->getTab("privileges")->selectList(