fixing copy block/recursion problem this fixes #880 (#891)

luyadev · Jun 14, 2016 · 5dbf8a7 · 5dbf8a7
1 parent 49b1f04
commit 5dbf8a7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ LUYA CHANGELOG
 -------------------------
 
 - `#877` **[BC BREAK]** Changing the `ngRestApiEndpoint` method to static. Use `public static function ngRestApiEndpoint()`.
+- `#880` Fixed copy/paste layout block recursion problem.
 - `#831` Close the propertie mask after saving/updating propertie values.
 - `#578` Added new sort relation plugin as requested to make relations with sortable data from model or array.
 - `#876` Improved textarea styling in zaa-table.

diff --git a/modules/cmsadmin/src/apis/NavItemBlockController.php b/modules/cmsadmin/src/apis/NavItemBlockController.php
@@ -38,7 +38,7 @@ public function actionCopyBlockFromStack()
     {
         $model = NavItemPageBlockItem::findOne(Yii::$app->request->post('copyBlockId', 0));
 
-        if ($model) {
+        if (($model) && ((Yii::$app->request->post('copyBlockId', 0) !== Yii::$app->request->post('prevId', false)))) {
             $newModel = new NavItemPageBlockItem();
             $newModel->attributes = $model->toArray();
             $newModel->is_dirty = 0;