From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Sun, 23 May 2004 16:54:48 +0000 (+0000)
Subject: keep image stuff on one line to help parser in cases where a thumb is embedded in... 
X-Git-Tag: 1.5.0alpha1~3217
X-Git-Url: https://git.cyclocoop.org/admin/?a=commitdiff_plain;h=0281882ed8a91c4537b172c4773087d720df256c;p=lhc%2Fweb%2Fwiklou.git

keep image stuff on one line to help parser in cases where a thumb is embedded in a list ( :[[image:something\|thumb]])
---

diff --git a/includes/Skin.php b/includes/Skin.php
index 91faf5b5d5..ca7aed5a0f 100644
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1833,9 +1833,9 @@ class Skin {
 				"<img src=\"{$url}\" alt=\"{$alt}\" /></a>";
 		}
 		if ( "" != $align ) {
-			$s = "<div class=\"float{$align}\"><span>{$s}</span>\n</div>";
+			$s = "<div class=\"float{$align}\"><span>{$s}</span></div>";
 		}
-		return $prefix.$s.$postfix;
+		return str_replace("\n", ' ',$prefix.$s.$postfix);
 	}
 
 
@@ -1897,8 +1897,8 @@ class Skin {
 					'width="15" height="11" alt="'.$more.'" /></a></div>';
 			}
 		}
-		$s .= '  <div class="thumbcaption" '.$textalign.'>'.$zoomicon.$label."</div></div>\n</div>";
-		return $s;
+		$s .= '  <div class="thumbcaption" '.$textalign.'>'.$zoomicon.$label."</div></div></div>";
+		return str_replace("\n", ' ', $s);
 	}
 
 	function makeMediaLink( $name, $url, $alt = "" ) {