Merge pull request #8674 from wilsonge/toString

Typecast queries rather than use the magic PHP method
joomla · Apr 12, 2016 · 6043ab9 · 6043ab9
2 parents e7cf48a + 1377d6c
commit 6043ab9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/components/com_banners/models/banners.php b/components/com_banners/models/banners.php
@@ -111,7 +111,7 @@ protected function getListQuery()
 					->where('sub.level <= this.level + ' . $levels);
 
 				// Add the subquery to the main query
-				$query->where('(' . $categoryEquals . ' OR a.catid IN (' . $subQuery->__toString() . '))');
+				$query->where('(' . $categoryEquals . ' OR a.catid IN (' . (string) $subQuery . '))');
 			}
 			else
 			{

diff --git a/components/com_content/models/articles.php b/components/com_content/models/articles.php
@@ -354,7 +354,7 @@ protected function getListQuery()
 				}
 
 				// Add the subquery to the main query
-				$query->where('(' . $categoryEquals . ' OR a.catid IN (' . $subQuery->__toString() . '))');
+				$query->where('(' . $categoryEquals . ' OR a.catid IN (' . (string) $subQuery . '))');
 			}
 			else
 			{

diff --git a/libraries/joomla/user/user.php b/libraries/joomla/user/user.php
@@ -417,7 +417,7 @@ public function getAuthorisedCategories($component, $action)
 
 		$query = $db->getQuery(true)
 			->select('c.id AS id, a.name AS asset_name')
-			->from('(' . $subQuery->__toString() . ') AS c')
+			->from('(' . (string) $subQuery . ') AS c')
 			->join('INNER', '#__assets AS a ON c.asset_id = a.id');
 		$db->setQuery($query);
 		$allCategories = $db->loadObjectList('id');