From 7ec00edf11f130a001be4910939af5d2b8f67681 Mon Sep 17 00:00:00 2001 From: Stanislas Rolland Date: Tue, 1 Feb 2011 21:13:22 +0000 Subject: [PATCH] Fixed bug #17438: htmlArea RTE: non-xhtml markup in image dialogue git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10365 709f56b5-9817-0410-a4d7-c38de5d9e867 --- ChangeLog | 1 + typo3/sysext/rtehtmlarea/ChangeLog | 1 + .../mod4/class.tx_rtehtmlarea_dam_browse_media.php | 2 +- .../mod4/class.tx_rtehtmlarea_select_image.php | 14 +++++++------- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f4d5c089fb5c..70c16614176e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ * Fixed bug #17373: Standalone images in RTE-enabled field not rendered in frontend * Fixed bug #17349: htmlArea RTE: JS error when using "Edit element" * Updated htmlArea RTE version to 2.2.0 + * Fixed bug #17438: htmlArea RTE: non-xhtml markup in image dialogue 2011-02-01 Steffen Kamper diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog index e430d81def3d..16e7e76116aa 100644 --- a/typo3/sysext/rtehtmlarea/ChangeLog +++ b/typo3/sysext/rtehtmlarea/ChangeLog @@ -2,6 +2,7 @@ * Fixed bug #17349: htmlArea RTE: JS error when using "Edit element" * Updated htmlArea RTE version to 2.2.0 + * Fixed bug #17438: htmlArea RTE: non-xhtml markup in image dialogue 2011-01-21 Stanislas Rolland diff --git a/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php b/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php index 3b3ca837b66a..fc2b87cb9171 100644 --- a/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php +++ b/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_dam_browse_media.php @@ -397,7 +397,7 @@ class tx_rtehtmlarea_dam_browse_media extends tx_dam_browse_media { var floatSelector=\'\'; var bgColor=\' class="bgColor4"\'; var sz=""; - sz+=\'\'; + sz+=\'
\'; '.(in_array('class', $this->removedProperties)?'':' if(classesImage) { sz+=\'\'; diff --git a/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php b/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php index 8811f25f76bd..be7446434ce6 100644 --- a/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php +++ b/typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php @@ -507,7 +507,7 @@ class tx_rtehtmlarea_select_image extends browse_links { } var bgColor=\' class="bgColor4"\'; var sz=""; - sz+=\'
\'+styleSelector+\'
\'; + sz+=\'
\'; '.(in_array('class', $removedProperties)?'':' if(classesImage) { sz+=\'\'; @@ -851,11 +851,11 @@ class tx_rtehtmlarea_select_image extends browse_links { $tree = $foldertree->getBrowsableTree(); list(,,$specUid) = explode('_',t3lib_div::_GP('PM')); $files = $this->expandFolder($foldertree->specUIDmap[$specUid],$this->act=='plain',$noThumbs?$noThumbs:!$_MOD_SETTINGS['displayThumbs']); - $this->content.= '
\'+styleSelector+\'
+ $this->content.= '
- + - +
'.$this->barheader($LANG->getLL('folderTree').':').$tree.''.$this->barheader($LANG->getLL('folderTree').':').$tree.'  '.$files.''.$files.'

'.$thumbNailCheck; @@ -872,11 +872,11 @@ class tx_rtehtmlarea_select_image extends browse_links { $tree = $foldertree->getBrowsableTree(); list(,,$specUid) = explode('_',t3lib_div::_GP('PM')); $files = $this->TBE_dragNDrop($foldertree->specUIDmap[$specUid], implode(',', $this->allowedFileTypes)); - $this->content.= ' + $this->content.= '
- + - +
'.$this->barheader($LANG->getLL('folderTree').':').$tree.''.$this->barheader($LANG->getLL('folderTree').':').$tree.'  '.$files.''.$files.'
'; break; -- 2.20.1