Fixed bug #5331: Remove the caption wrap on images if no caption is set (thanks to...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2396 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index e42eb97..248b907 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-07-11  Oliver Hader  <oh@inpublica.de>
+
+       * Fixed bug #5331: Remove the caption wrap on images if no caption is set (thanks to Georg Ringer)
+
 2007-07-07  Oliver Hader  <oh@inpublica.de>
 
        * Fixed bug #5053: imgNameNotRandom on TMENU/GMENU could break rollover behaviour (thanks to Ralf Hettinger)

diff --git a/typo3/sysext/css_styled_content/static/setup.txt b/typo3/sysext/css_styled_content/static/setup.txt
index 1819829..ed1be59 100755 (executable)
--- a/typo3/sysext/css_styled_content/static/setup.txt
+++ b/typo3/sysext/css_styled_content/static/setup.txt
@@ -1333,7 +1333,10 @@ tt_content.image.20 {
                        oneImageStdWrap.dataWrap = <dl class="csc-textpic-image###CLASSES###" style="width:{register:imagespace}px;"> | </dl>
                        imgTagStdWrap.wrap = <dt> | </dt>
                        editIconsStdWrap.wrap = <dd> | </dd>
-                       caption.wrap = <dd class="csc-textpic-caption"> | </dd>
+                       caption {
+                               required = 1
+                               wrap = <dd class="csc-textpic-caption"> | </dd>
+                       }
                }
                ul {
                        imageRowStdWrap.dataWrap = <div class="csc-textpic-imagerow" style="width:{register:rowwidth}px;"><ul> | </ul></div>