Merge remote-tracking branch 'upstream/4.0-dev' into j4/frameworkImage

joomla · Aug 3, 2019 · de1495a · de1495a
2 parents 9c5f894 + 511547a
commit de1495a
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/plugins/sampledata/testing/testing.php b/plugins/sampledata/testing/testing.php
@@ -1021,7 +1021,8 @@ public function onAjaxSampledataApplyStep4()
 			return $response;
 		}
 
-		$this->app->setUserState('sampledata.testing.articles', $ids);
+		$articleNamespace = (array) $this->app->getUserState('sampledata.testing.articles');
+		$this->app->setUserState('sampledata.testing.articles', array_merge($ids, $articleNamespace));
 
 		$response            = array();
 		$response['success'] = true;
@@ -4589,7 +4590,7 @@ private function addCategories(array $categories, $extension, $level)
 			}
 
 			// Get ID from category we just added
-			$catIds[] = $this->categoryModel->getItem()->id;
+			$catIds[] = $this->categoryModel->getState($this->categoryModel->getName() . '.id');
 		}
 
 		return $catIds;
@@ -4664,7 +4665,7 @@ private function addArticles(array $articles)
 			}
 
 			// Get ID from category we just added
-			$ids[] = $model->getItem()->id;
+			$ids[] = $model->getState($model->getName() . '.id');
 		}
 
 		return $ids;