@@ -43,36 +43,49 @@ class tl_content_eSM_artLayout extends \Backend

   {

     $groups = array();

-    // Get article model

-    $Article = \ArticleModel::findByPk($dc->activeRecord->pid);

-    // Check for article layout

-    if ($Article->es_type)

+    if ($dc->activeRecord->ptable == 'tl_article')

     {

-      // Get layout model

-      $ArticleLayout = \ArticleLayoutsModel::findByPk($Article->es_type);

+      // Get article model

+      $Article = \ArticleModel::findByPk($dc->activeRecord->pid);

-      // Build array of allowed elements if restriction is set

-      if ($ArticleLayout !== null && $ArticleLayout->restrictContentElements)

+      // Check for article layout

+      if ($Article->es_type)

       {

-        $arrAllowedCTE = deserialize($ArticleLayout->allowedElements,true);

-      }

-    }

+        // Get layout model

+        $ArticleLayout = \ArticleLayoutsModel::findByPk($Article->es_type);

-    // Build elements groups

-    foreach ($GLOBALS['TL_CTE'] as $k => $v)

-    {

-      foreach (array_keys($v) as $kk) {

+        // Build array of allowed elements if restriction is set

+        if ($ArticleLayout !== null && $ArticleLayout->restrictContentElements)

+        {

+          $arrAllowedCTE = deserialize($ArticleLayout->allowedElements, true);

+        }

+      }

-        // Skip not allowed elements

-        if (isset($arrAllowedCTE))

+      // Build elements groups

+      foreach ($GLOBALS['TL_CTE'] as $k => $v)

+      {

+        foreach (array_keys($v) as $kk)

         {

-          if (!in_array($kk, $arrAllowedCTE))

+

+          // Skip not allowed elements

+          if (isset($arrAllowedCTE))

           {

-            continue;

+            if (!in_array($kk, $arrAllowedCTE))

+            {

+              continue;

+            }

           }

+          $groups[$k][] = $kk;

+        }

+      }

+    } else {

+      foreach ($GLOBALS['TL_CTE'] as $k=>$v)

+      {

+        foreach (array_keys($v) as $kk)

+        {

+          $groups[$k][] = $kk;

         }

-        $groups[$k][] = $kk;

       }

     }