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

merging 5.4.3 changes

Browse source
This commit is contained in:
JT Smith 2003-07-27 21:32:32 +00:00
parent c1f4105699
commit dc9a81080a
17 changed files with 106 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI/Macro/RandomImage.pm
View file

@ -20,12 +20,11 @@ use WebGUI::SQL;
#-------------------------------------------------------------------
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $collateralFolderId;
my $collateralFolderId = 0;
if ($param[0] ne "") {
($collateralFolderId) = WebGUI::SQL->quickArray("select collateralFolderId from collateralFolder
where name=".quote($param[0]));
} else {
$collateralFolderId = 0; #Root
$collateralFolderId = 0 unless ($collateralFolderId);
}
my @images = WebGUI::SQL->buildArray("select collateralId from collateral
where collateralType='image' and collateralFolderId=".$collateralFolderId);

5
lib/WebGUI/Macro/RandomSnippet.pm
View file

@ -20,12 +20,11 @@ use WebGUI::SQL;
#-------------------------------------------------------------------
sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $collateralFolderId;
my $collateralFolderId = 0;
if ($param[0] ne "") {
($collateralFolderId) = WebGUI::SQL->quickArray("select collateralFolderId from collateralFolder
where name=".quote($param[0]));
} else {
$collateralFolderId = 0; #Root
$collateralFolderId = 0 unless ($collateralFolderId);
}
my @snippets = WebGUI::SQL->buildArray("select collateralId from collateral
where collateralType='snippet' and collateralFolderId=".$collateralFolderId);