merging some 5.4.4 changes

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

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