From ba6810c68b6e2a9b06eec0b6603fdd2c34c40ba1 Mon Sep 17 00:00:00 2001
From: Johan Janssens <johan@timble.net>
Date: Fri, 4 Mar 2016 23:31:02 +0100
Subject: [PATCH] #24 - Port security fixes from Joomla v3.4.6 - v3.4.8

---
 administrator/components/com_content/models/article.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php
index 0a669ee..2dac28f 100644
--- a/administrator/components/com_content/models/article.php
+++ b/administrator/components/com_content/models/article.php
@@ -483,9 +483,12 @@ public function save($data)
 				// Adding self to the association
 				$associations = $data['associations'];
 
+                // Unset any invalid associations
+                $associations = Joomla\Utilities\ArrayHelper::toInteger($associations);
+
 				foreach ($associations as $tag => $id)
 				{
-					if (empty($id))
+					if (!$id)
 					{
 						unset($associations[$tag]);
 					}
@@ -525,7 +528,7 @@ public function save($data)
 
 					foreach ($associations as $id)
 					{
-						$query->values($id . ',' . $db->quote('com_content.item') . ',' . $db->quote($key));
+						$query->values((int) $id . ',' . $db->quote('com_content.item') . ',' . $db->quote($key));
 					}
 
 					$db->setQuery($query);