Merge pull request #8953 from infograf768/savecopy_assoc2

Simplifying #8918 and solving Notice
joomla · Jan 21, 2016 · d1ccb9c · d1ccb9c
2 parents 511a0c2 + 2316868
commit d1ccb9c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/libraries/legacy/controller/form.php b/libraries/legacy/controller/form.php
@@ -659,14 +659,9 @@ public function save($key = null, $urlVar = null)
 				return false;
 			}
 
-			// Reset the ID and then treat the request as for Apply.
+			// Reset the ID, the multilingual associations and then treat the request as for Apply.
 			$data[$key] = 0;
-
-			// Reset multilingual associations if necessary
-			if (isset($data['associations']) && array_sum($data['associations']) != 0)
-			{
-				$data['associations'] = array();
-			}
+			$data['associations'] = array();
 			$task = 'apply';
 		}
 

diff --git a/libraries/legacy/model/admin.php b/libraries/legacy/model/admin.php
@@ -1201,7 +1201,7 @@ public function save($data)
 
 		$this->setState($this->getName() . '.new', $isNew);
 
-		if ($this->associationsContext && JLanguageAssociations::isEnabled())
+		if ($this->associationsContext && JLanguageAssociations::isEnabled() && !empty($data['associations']))
 		{
 			$associations = $data['associations'];