From 6d341f49ad5807e0c2bc97dd3ae963956828b09b Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Sun, 12 May 2019 20:20:48 +0100
Subject: [PATCH 1/2] [4.0] com_newsfeeds sidebar

Removes the unused sidebar code from com_newsfeeds
---
 .../components/com_newsfeeds/View/Newsfeeds/HtmlView.php   | 1 -
 .../components/com_newsfeeds/tmpl/newsfeeds/default.php    | 7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php b/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
index 558ddbbd444c9..0b05132f7856e 100644
--- a/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
+++ b/administrator/components/com_newsfeeds/View/Newsfeeds/HtmlView.php
@@ -86,7 +86,6 @@ public function display($tpl = null)
 		if ($this->getLayout() !== 'modal')
 		{
 			$this->addToolbar();
-			$this->sidebar = \JHtmlSidebar::render();
 
 			// We do not need to filter by language when multilingual is disabled
 			if (!Multilanguage::isEnabled())
diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
index d5c0bcd449b01..f214b643060dd 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
@@ -35,12 +35,7 @@
 ?>
 <form action="<?php echo Route::_('index.php?option=com_newsfeeds&view=newsfeeds'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
-		<?php if (!empty($this->sidebar)) : ?>
-            <div id="j-sidebar-container" class="col-md-2">
-				<?php echo $this->sidebar; ?>
-            </div>
-		<?php endif; ?>
-        <div class="<?php if (!empty($this->sidebar)) {echo 'col-md-10'; } else { echo 'col-md-12'; } ?>">
+        <div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>

From b0f04ed0c7584777b462003bad42af9cfea92e17 Mon Sep 17 00:00:00 2001
From: Brian Teeman <brian@teeman.net>
Date: Mon, 13 May 2019 15:29:42 +0100
Subject: [PATCH 2/2] Update
 administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php

Co-Authored-By: Quy <quy@fluxbb.org>
---
 .../components/com_newsfeeds/tmpl/newsfeeds/default.php         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
index f214b643060dd..3d87d609cfd56 100644
--- a/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
+++ b/administrator/components/com_newsfeeds/tmpl/newsfeeds/default.php
@@ -35,7 +35,7 @@
 ?>
 <form action="<?php echo Route::_('index.php?option=com_newsfeeds&view=newsfeeds'); ?>" method="post" name="adminForm" id="adminForm">
 	<div class="row">
-        <div class="col-md-12">
+		<div class="col-md-12">
 			<div id="j-main-container" class="j-main-container">
 				<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 				<?php if (empty($this->items)) : ?>