[imp] Handle DB errors in search plugins. Closes #6711. Closes #6714. C…

…loses #6715. Closes #6716. Closes #6717. Closes #7073.
joomla · Jun 16, 2015 · 06b38e2 · 06b38e2
1 parent a05e149
commit 06b38e2
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 7 deletions.
diff --git a/plugins/editors/tinymce/tinymce.php b/plugins/editors/tinymce/tinymce.php
@@ -120,7 +120,16 @@ public function onInit()
 			->where('client_id=0 AND home=' . $db->quote('1'));
 
 		$db->setQuery($query);
-		$template = $db->loadResult();
+		try
+		{
+			$template = $db->loadResult();
+		}
+		catch (RuntimeException $e)
+		{
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			JLog::add($e->getMessage(), JLog::ERROR, 'controller');
+			return;
+		}
 
 		$content_css    = '';
 		$templates_path = JPATH_SITE . '/templates';

diff --git a/plugins/search/categories/categories.php b/plugins/search/categories/categories.php
@@ -169,7 +169,16 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		}
 
 		$db->setQuery($query, 0, $limit);
-		$rows = $db->loadObjectList();
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			JLog::add($e->getMessage(), JLog::ERROR, 'controller');
+		}
 
 		$return = array();
 

diff --git a/plugins/search/contacts/contacts.php b/plugins/search/contacts/contacts.php
@@ -167,7 +167,17 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		}
 
 		$db->setQuery($query, 0, $limit);
-		$rows = $db->loadObjectList();
+
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			JLog::add($e->getMessage(), JLog::ERROR, 'controller');
+		}
 
 		if ($rows)
 		{

diff --git a/plugins/search/content/content.php b/plugins/search/content/content.php
@@ -189,7 +189,16 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 			}
 
 			$db->setQuery($query, 0, $limit);
-			$list = $db->loadObjectList();
+			try
+			{
+				$list = $db->loadObjectList();
+			}
+			catch (RuntimeException $e)
+			{
+				$list = array();
+				JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+				JLog::add($e->getMessage(), JLog::ERROR, 'controller');
+			}
 			$limit -= count($list);
 
 			if (isset($list))
@@ -251,7 +260,16 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 			}
 
 			$db->setQuery($query, 0, $limit);
-			$list3 = $db->loadObjectList();
+			try
+			{
+				$list3 = $db->loadObjectList();
+			}
+			catch (RuntimeException $e)
+			{
+				$list3 = array();
+				JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+				JLog::add($e->getMessage(), JLog::ERROR, 'controller');
+			}
 
 			// Find an itemid for archived to use if there isn't another one.
 			$item = $app->getMenu()->getItems('link', 'index.php?option=com_content&view=archive', true);

diff --git a/plugins/search/newsfeeds/newsfeeds.php b/plugins/search/newsfeeds/newsfeeds.php
@@ -181,7 +181,16 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		}
 
 		$db->setQuery($query, 0, $limit);
-		$rows = $db->loadObjectList();
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			JLog::add($e->getMessage(), JLog::ERROR, 'controller');
+		}
 
 		if ($rows)
 		{

diff --git a/plugins/search/tags/tags.php b/plugins/search/tags/tags.php
@@ -136,7 +136,16 @@ public function onContentSearch($text, $phrase = '', $ordering = '', $areas = nu
 		$query->order($order);
 
 		$db->setQuery($query, 0, $limit);
-		$rows = $db->loadObjectList();
+		try
+		{
+			$rows = $db->loadObjectList();
+		}
+		catch (RuntimeException $e)
+		{
+			$rows = array();
+			JFactory::getApplication()->enqueueMessage(JText::_('JERROR_AN_ERROR_HAS_OCCURRED'), 'error');
+			JLog::add($e->getMessage(), JLog::ERROR, 'controller');
+		}
 
 		if ($rows)
 		{