@@ -156,6 +156,31 @@ class tl_article_eSM_artLayout extends \Backend

    */

   public function setDefaultLayout(\DataContainer $dc)

   {

+    if ($_GET['act'] == 'create') {

+      if ($_GET['mode'] == 1)

+      {

+        $ArticleModel = \ArticleModel::findByPk($_GET['pid']);

+        if ($ArticleModel !== null)

+        {

+          $PageModel = $ArticleModel->getRelated('pid');

+          $PageModel->loadDetails();

+        }

+      } else if ($_GET['mode'] == 2)

+      {

+        $PageModel = \PageModel::findWithDetails($_GET['pid']);

+      }

+

+      if ($PageModel !== null)

+      {

+        $LayoutModel = \LayoutModel::findByPk($PageModel->layout);

+        $ArticleDefaultLayout = \Database::getInstance()->prepare("SELECT al.id FROM tl_article_layouts al, tl_theme t WHERE t.id = al.pid AND isDefault = '1' AND al.pid = ? ORDER BY t.name, al.sorting LIMIT 1")->execute($LayoutModel->pid);

+

+        if ($ArticleDefaultLayout->numRows)

+        {

+          $GLOBALS['TL_DCA']['tl_article']['fields']['es_type']['default'] = $ArticleDefaultLayout->id;

+        }

+      }

+    }

     if ($_GET['act'] == 'edit')

     {

       $ArticleModel = \ArticleModel::findByPk($dc->id);

@@ -170,12 +195,13 @@ class tl_article_eSM_artLayout extends \Backend

           if ($PageModel !== null)

           {

-            $ArticleDefaultLayout = \Database::getInstance()->prepare("SELECT al.id FROM tl_article_layouts al, tl_theme t WHERE t.id = al.pid AND isDefault = '1' AND al.pid = ? ORDER BY t.name, al.sorting LIMIT 1")->execute($LayoutModel->id);

+            $ArticleDefaultLayout = \Database::getInstance()->prepare("SELECT al.id FROM tl_article_layouts al, tl_theme t WHERE t.id = al.pid AND isDefault = '1' AND al.pid = ? ORDER BY t.name, al.sorting LIMIT 1")->execute($LayoutModel->pid);

             if ($ArticleDefaultLayout->numRows)

             {

               $ArticleModel->es_type = $ArticleDefaultLayout->id;

               $ArticleModel->save();

+              $this->reload();

             }

           }

         }