Author: jfthomps
Date: Thu Aug 10 20:07:04 2017
New Revision: 1804717
URL: http://svn.apache.org/viewvc?rev=1804717&view=rev
Log:
VCL-1075 - Newlines in image description not handled properly under Manage
Images
image.php: modified AJeditResource: added preg_replace for description that
converts <br> to \n
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=1804717&r1=1804716&r2=1804717&view=diff
==============================================================================
--- vcl/trunk/web/.ht-inc/image.php (original)
+++ vcl/trunk/web/.ht-inc/image.php Thu Aug 10 20:07:04 2017
@@ -686,6 +686,7 @@ class Image extends Resource {
$tmp = $this->getData(array('includedeleted' => 0, 'rscid' =>
$imageid));
$data = $tmp[$imageid];
$extra = getImageNotes($imageid);
+ $extra['description'] = preg_replace('/<br>/', "\n",
$extra['description']);
$extra['description'] =
htmlspecialchars_decode($extra['description']);
$extra['usage'] = htmlspecialchars_decode($extra['usage']);
$data = array_merge($data, $extra);
