merging 5.8.0 and 6.1.1 changes

This commit is contained in:
JT Smith 2004-07-18 17:43:08 +00:00
parent ae87943d1e
commit 797b8581b6
14 changed files with 109 additions and 16296 deletions

View file

@ -27,7 +27,7 @@ sub process {
my @param = WebGUI::Macro::getParams($_[0]);
my $templateId = $param[0] || 1;
my %var;
my (%cphash, %hash2, %hash, $r, $i, @item, $query);
my (%cphash, %hash2, %hash, $r, @item, $query);
tie %hash, "Tie::IxHash";
tie %hash2, "Tie::IxHash";
tie %cphash, "Tie::CPHash";
@ -182,12 +182,6 @@ sub process {
%hash
);
}
if (WebGUI::Grouping::isInGroup(10)) {
%hash = (
WebGUI::URL::page('op=listLanguages')=>WebGUI::International::get(585),
%hash
);
}
%hash = (
WebGUI::URL::page('op=viewHelpIndex')=>WebGUI::International::get(13),
%hash