Merge remote-tracking branch 'origin/0.9.31'

2013-12-08 10:22:21 +01:00
parent 0c0c8c63a7 dde6581f9c
commit 0f80e66a01
10 changed files with 50 additions and 5 deletions
--- a/templates/Sparkle/admin/index/index.tpl
+++ b/templates/Sparkle/admin/index/index.tpl
@@ -165,7 +165,8 @@ $header
 			
 		</section>
 		
-		
+
+		<if $settings['admin']['show_news_feed'] == '1'>
 		<section class="dboarditem bradius" id="newsfeed" style="display: none">
 			<table>
 				<tr>
@@ -174,7 +175,8 @@ $header
 			</table>
 			<div id="newsfeeditems"></div>
 		</section>
-		
+		</if>
+
 		<section class="dboarditem bradius">
 		<table>
 		<tr>