merging 5.4.2 changes

This commit is contained in:
JT Smith 2003-07-14 06:16:55 +00:00
parent a4d391b52a
commit 0726e2fd62
9 changed files with 2608 additions and 57 deletions

View file

@ -74,13 +74,6 @@ sub adminOnly {
my ($output, $sth, @data);
$output = '<h1>'.WebGUI::International::get(35).'</h1>';
$output .= WebGUI::International::get(36);
$output .= '<ul>';
$sth = WebGUI::SQL->read("select users.username,users.userId from users,groupings where users.userId=groupings.userId and groupings.groupId=3 order by users.username");
while (@data = $sth->array) {
$output .= '<li><a href="'.WebGUI::URL::page('op=viewProfile&uid='.$data[1]).'">'.$data[0].'</a>';
}
$sth->finish;
$output .= '</ul><p>';
return $output;
}
@ -117,7 +110,6 @@ sub canEditPage {
}
}
#Added by Frank Dillon. Wobject API not used due to possible performance issues
#-------------------------------------------------------------------
=head2 canEditWobject ( wobjectId )
@ -186,7 +178,6 @@ sub canViewPage {
}
}
#Added by Frank Dillon. Wobject API not used due to possible performance issues
#-------------------------------------------------------------------
=head2 canViewWobject ( wobjectId )