add advanced where clause param

joomla · Apr 25, 2018 · d99dca5 · d99dca5
1 parent 1686ab3
commit d99dca5
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/libraries/src/Language/Associations.php b/libraries/src/Language/Associations.php
@@ -29,20 +29,21 @@ class Associations
 	 * @param   string   $pk          The name of the primary key in the given $table.
 	 * @param   string   $aliasField  If the table has an alias field set it here. Null to not use it
 	 * @param   string   $catField    If the table has a catid field set it here. Null to not use it
+	 * @param   array    $advClause   Array with advanced where clause use c as parent column key, c2 as associations column key
 	 *
 	 * @return  array                The associated items
 	 *
 	 * @since   3.1
 	 *
 	 * @throws  \Exception
 	 */
-	public static function getAssociations($extension, $tablename, $context, $id, $pk = 'id', $aliasField = 'alias', $catField = 'catid')
+	public static function getAssociations($extension, $tablename, $context, $id, $pk = 'id', $aliasField = 'alias', $catField = 'catid', $advClause = array())
 	{
 		// To avoid doing duplicate database queries.
 		static $multilanguageAssociations = array();
 
 		// Multilanguage association array key. If the key is already in the array we don't need to run the query again, just return it.
-		$queryKey = implode('|', func_get_args());
+		$queryKey = implode('|', array($extension, $tablename, $context, $id));
 
 		if (!isset($multilanguageAssociations[$queryKey]))
 		{
@@ -97,6 +98,15 @@ public static function getAssociations($extension, $tablename, $context, $id, $p
 				$query->where('c.extension = ' . $db->quote($extension));
 			}
 
+			// Advanced where clause
+			if (!empty($advClause))
+			{
+				foreach ($advClause as $clause)
+				{
+					$query->where($clause);
+				}
+			}
+
 			$db->setQuery($query);
 
 			try