oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging some 5.4.4 changes

Browse source
This commit is contained in:
JT Smith 2003-09-13 19:45:04 +00:00
parent ac102923ce
commit eb4a6bca87
8 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Operation/Collateral.pm
View file

@ -551,7 +551,7 @@ sub www_htmlArealistCollateral {
"closed.gif", $indent, "", $delete);
}
# Extend tree with images in current folder
$sth = WebGUI::SQL->read('select collateralId, name, filename from collateral where collateralType = "image" '.
$sth = WebGUI::SQL->read("select collateralId, name, filename from collateral where collateralType = 'image' ".
"and collateralFolderId = $folderId");
while ($data = $sth->hashRef) {
$data->{filename} =~ /\.([^\.]+)$/; # Get extension

2
lib/WebGUI/Operation/Package.pm
View file

@ -47,7 +47,7 @@ sub _recursePageTree {
%newParent = WebGUI::SQL->quickHash("select * from page where pageId=$_[1]");
_duplicateWobjects($_[0],$_[1]);
($sequenceNumber) = WebGUI::SQL->quickArray("select max(sequenceNumber) from page where parentId=$_[1]");
$a = WebGUI::SQL->read("select * from page where parentId=$_[0]");
$a = WebGUI::SQL->read("select * from page where parentId=$_[0] order by sequenceNumber");
while (%package = $a->hash) {
$newPageId = getNextId("pageId");
$sequenceNumber++;