You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by jf...@apache.org on 2015/02/03 17:20:10 UTC
svn commit: r1656777 - /vcl/trunk/web/.ht-inc/image.php
Author: jfthomps
Date: Tue Feb 3 16:20:09 2015
New Revision: 1656777
URL: http://svn.apache.org/r1656777
Log:
VCL-776 - rework resource code to have a base class for all resources and inheriting classes for each resource type
image.php: modified AJeditResource: decode html special characters for image description and usage notes before sending response; the textarea dijit widget does not need the strings html escaped, and leaving them escaped resulted in & repeatedly being converted to &
Modified:
vcl/trunk/web/.ht-inc/image.php
Modified: vcl/trunk/web/.ht-inc/image.php
URL: http://svn.apache.org/viewvc/vcl/trunk/web/.ht-inc/image.php?rev=1656777&r1=1656776&r2=1656777&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/image.php (original)
+++ vcl/trunk/web/.ht-inc/image.php Tue Feb 3 16:20:09 2015
@@ -642,6 +642,8 @@ class Image extends Resource {
$tmp = $this->getData(array('includedeleted' => 0, 'rscid' => $imageid));
$data = $tmp[$imageid];
$extra = getImageNotes($imageid);
+ $extra['description'] = htmlspecialchars_decode($extra['description']);
+ $extra['usage'] = htmlspecialchars_decode($extra['usage']);
$data = array_merge($data, $extra);
$cdata = $this->basecdata;
$cdata['imageid'] = $imageid;