From: Daniel Kinzler <daniel@users.mediawiki.org>
Date: Wed, 2 Jul 2008 14:45:29 +0000 (+0000)
Subject: Allow raw HTML blocks in data['sidebar'] array. This provides a simple ways for exten... 
X-Git-Tag: 1.31.0-rc.0~46804
X-Git-Url: https://git.cyclocoop.org//%22?a=commitdiff_plain;h=e80541dbe9d370c4f10d25e71400566eae566a91;p=lhc%2Fweb%2Fwiklou.git

Allow raw HTML blocks in data['sidebar'] array. This provides a simple ways for extensions to inject portlets containing arbitrary HTML code. For use by CategoryTree and others.
---

diff --git a/skins/Modern.php b/skins/Modern.php
index ea75e1ca08..0d96f64085 100644
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -154,6 +154,7 @@ class ModernTemplate extends QuickTemplate {
 	<div class='generated-sidebar portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $skin->tooltip('p-'.$bar) ?>>
 		<h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
 		<div class='pBody'>
+<?php   if ( is_array( $cont ) ) { ?>
 			<ul>
 <?php 			foreach($cont as $key => $val) { ?>
 				<li id="<?php echo Sanitizer::escapeId($val['id']) ?>"<?php
@@ -161,6 +162,11 @@ class ModernTemplate extends QuickTemplate {
 				?>><a href="<?php echo htmlspecialchars($val['href']) ?>"<?php echo $skin->tooltipAndAccesskey($val['id']) ?>><?php echo htmlspecialchars($val['text']) ?></a></li>
 <?php			} ?>
 			</ul>
+<?php   } else {
+			# allow raw HTML block to be defined by extensions
+			print $cont;
+	} 
+?>
 		</div><!-- pBody -->
 	</div><!-- portlet -->
 	<?php } ?>
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 5fb397f95e..5d7012435d 100644
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -156,6 +156,7 @@ class MonoBookTemplate extends QuickTemplate {
 	<div class='generated-sidebar portlet' id='p-<?php echo Sanitizer::escapeId($bar) ?>'<?php echo $skin->tooltip('p-'.$bar) ?>>
 		<h5><?php $out = wfMsg( $bar ); if (wfEmptyMsg($bar, $out)) echo $bar; else echo $out; ?></h5>
 		<div class='pBody'>
+<?php   if ( is_array( $cont ) ) { ?>
 			<ul>
 <?php 			foreach($cont as $key => $val) { ?>
 				<li id="<?php echo Sanitizer::escapeId($val['id']) ?>"<?php
@@ -163,6 +164,11 @@ class MonoBookTemplate extends QuickTemplate {
 				?>><a href="<?php echo htmlspecialchars($val['href']) ?>"<?php echo $skin->tooltipAndAccesskey($val['id']) ?>><?php echo htmlspecialchars($val['text']) ?></a></li>
 <?php			} ?>
 			</ul>
+<?php   } else {
+			# allow raw HTML block to be defined by extensions
+			print $cont;
+	} 
+?>
 		</div>
 	</div>
 	<?php } ?>