Fixed bug #6902: Add an imagespace to Text w/ Image when image width is not available...
authorJeff Segars <jsegars@alumni.rice.edu>
Thu, 31 Jan 2008 17:04:49 +0000 (17:04 +0000)
committerJeff Segars <jsegars@alumni.rice.edu>
Thu, 31 Jan 2008 17:04:49 +0000 (17:04 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@2988 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php

index 4f0c3df..4e2bcb6 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-31  Jeff Segars  <jeff@webempoweredchurch.org>
+
+       * Fixed bug #6902: Add an imagespace to Text w/ Image when image width is not available. Thanks to Georg Ringer.
+
 2008-01-31  Benjamin Mack   <mack@xnos.org>
 
        * Fixed Bug #4770: css_styled_content - rowSpace also puts space below last image row
index 74e8e23..e37d163 100755 (executable)
@@ -644,7 +644,12 @@ class tx_cssstyledcontent_pi1 extends tslib_pibase {
                                // Store the original filepath
                        $origImages[$imgKey] = $GLOBALS['TSFE']->lastImageInfo;
 
-                       $imageRowsFinalWidths[floor($a/$colCount)] += $GLOBALS['TSFE']->lastImageInfo[0];
+                       if ($GLOBALS['TSFE']->lastImageInfo[0]==0) {
+                               $imageRowsFinalWidths[floor($a/$colCount)] += $this->cObj->data['imagewidth'];
+                       } else {
+                               $imageRowsFinalWidths[floor($a/$colCount)] += $GLOBALS['TSFE']->lastImageInfo[0];
+                       }
+
                }
                        // How much space will the image-block occupy?
                $imageBlockWidth = max($imageRowsFinalWidths)+ $colspacing*($colCount-1) + $colCount*$border*($borderSpace+$borderThickness)*2;
@@ -707,7 +712,12 @@ class tx_cssstyledcontent_pi1 extends tslib_pibase {
                                }
 
                                        // Render one image
-                               $imageSpace = $origImages[$imgKey][0] + $border*($borderSpace+$borderThickness)*2;
+                               if($origImages[$imgKey][0]==0) {
+                                       $imageSpace=$this->cObj->data['imagewidth'] + $border*($borderSpace+$borderThickness)*2;
+                               } else {
+                                       $imageSpace = $origImages[$imgKey][0] + $border*($borderSpace+$borderThickness)*2;
+                               }
+                                       
                                $GLOBALS['TSFE']->register['IMAGE_NUM'] = $imgKey;
                                $GLOBALS['TSFE']->register['IMAGE_NUM_CURRENT'] = $imgKey;
                                $GLOBALS['TSFE']->register['ORIG_FILENAME'] = $origImages[$imgKey]['origFile'];