merging 6.2.10 and 6.2.11 changes

2005-01-28 22:19:39 +00:00 · 2005-01-28 22:19:39 +00:00 · d47830aceb
commit d47830aceb
parent 486b96d94d
28 changed files with 139 additions and 59 deletions
--- a/lib/WebGUI/Macro/SI_scaledImage.pm
+++ b/lib/WebGUI/Macro/SI_scaledImage.pm
@ -42,7 +42,7 @@ sub process {
        my ($collateralIdent,$width,$height,$parameters) = WebGUI::Macro::getParams($_[0]);
        my ($collateral,$url);
       
-        if ($collateralIdent =~ /^\d+$/) {
+	if ($collateralIdent =~ /[\w|\-]{22}/) {
          $collateral = WebGUI::Collateral->new($collateralIdent);
        }
        else {