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

diff --git a/ChangeLog b/ChangeLog
index f4d5c08..70c1661 100755 (executable)
--- 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  <steffen@typo3.org>
 

diff --git a/typo3/sysext/rtehtmlarea/ChangeLog b/typo3/sysext/rtehtmlarea/ChangeLog
index e430d81..16e7e76 100644 (file)
--- 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  <typo3@sjbr.ca>
 

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 3b3ca83..fc2b87c 100644 (file)
--- 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=\'<select id="iFloat" name="iFloat"><option value="">' . $LANG->getLL('notSet') . '</option><option value="none">' . $LANG->getLL('nonFloating') . '</option><option value="left">' . $LANG->getLL('left') . '</option><option value="right">' . $LANG->getLL('right') . '</option></select>\';
                                var bgColor=\' class="bgColor4"\';
                                var sz="";
-                               sz+=\'<table border=0 cellpadding=1 cellspacing=1><form action="" name="imageData">\';
+                               sz+=\'<table border="0" cellpadding="1" cellspacing="1"><form action="" name="imageData">\';
                                '.(in_array('class', $this->removedProperties)?'':'
                                if(classesImage) {
                                        sz+=\'<tr><td\'+bgColor+\'><label for="iClass">'.$LANG->getLL('class').': </label></td><td>\'+styleSelector+\'</td></tr>\';

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 8811f25..be74464 100644 (file)
--- 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+=\'<table border=0 cellpadding=1 cellspacing=1><form action="" name="imageData">\';
+                               sz+=\'<table border="0" cellpadding="1" cellspacing="1"><form action="" name="imageData">\';
                                '.(in_array('class', $removedProperties)?'':'
                                if(classesImage) {
                                        sz+=\'<tr><td\'+bgColor+\'><label for="iClass">'.$LANG->getLL('class').': </label></td><td>\'+styleSelector+\'</td></tr>\';
@@ -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.= '<table border=0 cellpadding=0 cellspacing=0>
+                               $this->content.= '<table border="0" cellpadding="0" cellspacing="0">
                                <tr>
-                                       <td valign=top>'.$this->barheader($LANG->getLL('folderTree').':').$tree.'</td>
+                                       <td style="vertical-align: top;">'.$this->barheader($LANG->getLL('folderTree').':').$tree.'</td>
                                        <td>&nbsp;</td>
-                                       <td valign=top>'.$files.'</td>
+                                       <td style="vertical-align: top;">'.$files.'</td>
                                </tr>
                                </table>
                                <br />'.$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.= '<table border=0 cellpadding=0 cellspacing=0>
+                               $this->content.= '<table border="0" cellpadding="0" cellspacing="0">
                                <tr>
-                                       <td valign=top>'.$this->barheader($LANG->getLL('folderTree').':').$tree.'</td>
+                                       <td style="vertical-align: top;">'.$this->barheader($LANG->getLL('folderTree').':').$tree.'</td>
                                        <td>&nbsp;</td>
-                                       <td valign=top>'.$files.'</td>
+                                       <td style="vertical-align: top;">'.$files.'</td>
                                </tr>
                                </table>';
                                break;