diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index a0328ab78..d292fdb20 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -2,7 +2,8 @@
- Fixed a couple of formatting problems with the USS.
- Added Text::Balanced to the distro.
-
+ = Fixed bug [ 910145 ] htmlArea - insert image not working (Len Kranendonk /
+Andreas Graf).
6.0.0
diff --git a/lib/WebGUI/Operation/Collateral.pm b/lib/WebGUI/Operation/Collateral.pm
index f02b0ce25..6bd36096c 100644
--- a/lib/WebGUI/Operation/Collateral.pm
+++ b/lib/WebGUI/Operation/Collateral.pm
@@ -516,7 +516,7 @@ sub _htmlAreaCreateTree {
#-------------------------------------------------------------------
sub www_htmlArealistCollateral {
my (@parents, $sth, $data, $indent);
- $session{form}{makePrintable}=1; $session{form}{style}=10; # Special style for this output
+ $session{page}{makePrintable}=1; $session{page}{printableStyleId}=10;
return "Only Content Managers are allowed to use WebGUI Collateral" unless (WebGUI::Privilege::isInGroup(4));
my $output = '
';
@@ -570,11 +570,11 @@ sub www_htmlArealistCollateral {
#-------------------------------------------------------------------
sub www_htmlAreaviewCollateral {
my($output, $collateral, $file, $x, $y, $image, $error);
- $session{form}{makePrintable}=1; $session{form}{style}=10; # Special style for this output
+ $session{page}{makePrintable}=1; $session{page}{printableStyleId}=10;
$output .= '';
if($session{form}{cid} == 0 || ! WebGUI::Privilege::isInGroup(4)) {
$output .= '| ';
- $output .= '
 ';
$output .= 'WebGUI Image Manager for htmlArea ';
$output .= ' |
';
@@ -607,7 +607,7 @@ sub www_htmlAreaviewCollateral {
#-------------------------------------------------------------------
sub www_htmlAreaUpload {
- $session{form}{makePrintable}=1; $session{form}{style}=10; # Special style for this output
+ $session{page}{makePrintable}=1; $session{page}{printableStyleId}=10;
return "Only Content Managers are allowed to use WebGUI Collateral" unless (WebGUI::Privilege::isInGroup(4));
return www_htmlArealistCollateral() if ($session{form}{image} eq "");
my($test, $file);
@@ -632,7 +632,7 @@ sub www_htmlAreaUpload {
#-------------------------------------------------------------------
sub www_htmlAreaDelete {
- $session{form}{makePrintable}=1; $session{form}{style}=10; # Special style for this output
+ $session{page}{makePrintable}=1; $session{page}{printableStyleId}=10;
return "Only Content Managers are allowed to use WebGUI Collateral" unless (WebGUI::Privilege::isInGroup(4));
if($session{form}{cid}) { # Delete Image
my $collateral = WebGUI::Collateral->new($session{form}{cid});
@@ -649,7 +649,7 @@ sub www_htmlAreaDelete {
#-------------------------------------------------------------------
sub www_htmlAreaCreateFolder {
- $session{form}{makePrintable}=1; $session{form}{style}=10; # Special style for this output
+ $session{page}{makePrintable}=1; $session{page}{printableStyleId}=10;
return "Only Content Managers are allowed to use WebGUI Collateral" unless (WebGUI::Privilege::isInGroup(4));
$session{form}{fid} = getNextId("collateralFolderId");
WebGUI::Session::setScratch("collateralFolderId",$session{form}{fid});