Merge pull request #44 from menatwork/contao-5.3-fix

Contao 5.3 fix

Author: davidmaack

src/Backend/Callbacks.php

@@ -15,6 +15,8 @@
 use Contao\BackendTemplate;
 use Contao\DataContainer;
 use Contao\System;
+use Contao\Database;
+use Contao\Input;
 
 /**
  * Generall class to handle all backend callbacks
@@ -66,8 +68,8 @@ public static function onsubmitCallback(DataContainer $dc)
         //if this is not a html5 element, do nothing
         if (in_array($dc->activeRecord->type, array('sHtml5Start', 'sHtml5End'))) {
 
-            $item = $dc->activeRecord;
             $util = new TagUtils($dc->table);
+            $item = $util->getCurrentRecord($dc->activeRecord->id);
 
             //correct the sh5_pid if needed
             if ($item->type == 'sHtml5Start' &&
@@ -91,7 +93,8 @@ public static function ondeleteCallback(DataContainer $dc, $id)
         //if this is not a html5 element, do nothing
         if (in_array($dc->activeRecord->type, array('sHtml5Start', 'sHtml5End'))) {
             $util = new TagUtils($dc->table);
-            $util->deleteCorrespondingTag($dc->activeRecord);
+            $item = $util->getCurrentRecord($dc->activeRecord->id);
+            $util->deleteCorrespondingTag($item);
         }
     }
 
@@ -108,13 +111,13 @@ public static function oncopyPageCallback($id, DataContainer $dc)
         $pages = array($id);
 
         //fetch the child pages, if needed
-        if (\Input::get('childs')) {
-            $pages = array_merge($pages, \Database::getInstance()->getChildRecords($id, 'tl_page'));
+        if (Input::get('childs')) {
+            $pages = array_merge($pages, Database::getInstance()->getChildRecords($id, 'tl_page'));
 
         }
 
         //fetch all html5 start elemnts and update them the end elements will be corrected automatically
-        $elements = \Database::getInstance()
+        $elements = Database::getInstance()
                 ->prepare(
                         sprintf(
                                 'SELECT * FROM tl_content '
@@ -147,7 +150,7 @@ public static function oncopyArticleCallback($id, DataContainer $dc)
     {
 
         //fetch all html5 start elemnts and update them the end elements will be corrected automatically
-        $elements = \Database::getInstance()
+        $elements = Database::getInstance()
                 ->prepare('SELECT * FROM tl_content WHERE type = "sHtml5Start" AND pid = ?')
                 ->execute($id);
 
@@ -175,7 +178,7 @@ public static function oncopyContentCallback($id, DataContainer $dc)
 
         //only handle copyAll cases. If only a single element was copied the
         //onsubmit callback will handle the correction
-        if (\Input::get('act') == 'copyAll') {
+        if (Input::get('act') == 'copyAll') {
 
             $util = new TagUtils($dc->table);
             $newElement = $util->getTag($id);

src/Backend/TagUtils.php

@@ -13,9 +13,10 @@
 namespace SemanticHTML5\Backend;
 
 use Contao\Database\Result;
+use Contao\Database;
 
 /**
- * Generall Helper Class for handling start and end tags
+ * General Helper Class for handling start and end tags
  */
 class TagUtils
 {
@@ -126,7 +127,7 @@ public function deleteCorrespondingTag(Result $item)
      */
     public function getTag($id) {
 
-        $item = \Database::getInstance()
+        $item = Database::getInstance()
                 ->prepare('SELECT * FROM ' . $this->table . ' WHERE (type ="sHtml5Start" OR type = "sHtml5End") AND id = ?')
                 ->execute($id);
 
@@ -141,7 +142,7 @@ public function getTag($id) {
     public function getcorrespondingTag(Result $item)
     {
         $type = $this->matchingTags[$item->type];
-        $result = \Database::getInstance()
+        $result = Database::getInstance()
                     ->prepare('SELECT * FROM ' . $this->table . ' WHERE pid = ? AND sh5_pid = ? AND type = ?')
                     ->execute($item->pid, $item->sh5_pid, $type);
 
@@ -168,11 +169,11 @@ public function createTag($data)
         unset($data['id']);
 
         //remove fields which are not present in the db table (See #22)
-        $tableFields = array_flip(\Database::getInstance()->getFieldNames($this->table));
+        $tableFields = array_flip(Database::getInstance()->getFieldNames($this->table));
         $data = array_intersect_key($data, $tableFields);
 
         // Insert the tag
-        $result = \Database::getInstance()
+        $result = Database::getInstance()
                 ->prepare("INSERT INTO " . $this->table . " %s")
                 ->set($data)
                 ->execute();
@@ -194,7 +195,7 @@ public function createTag($data)
     public function deleteTag($id)
     {
         //ToDo: add the UnDo functionality from contao
-        \Database::getInstance()
+        Database::getInstance()
                 ->prepare('DELETE FROM ' . $this->table . ' WHERE id = ? '
                         . 'AND (type = "sHtml5Start" OR type = "sHtml5End")')
                 ->execute($id);
@@ -210,17 +211,28 @@ public function deleteTag($id)
     public function updateTag($id, $data)
     {
         //update the database
-        \Database::getInstance()
+        Database::getInstance()
                 ->prepare('UPDATE ' . $this->table . ' %s WHERE id = ?')
                 ->set($data)
                 ->execute($id);
 
         //return the updated element
-        return \Database::getInstance()
-                ->prepare('SELECT * FROM ' . $this->table . ' WHERE id = ?')
-                ->execute($id);
+        return $this->getCurrentRecord($id);
     }
 
+    /**
+     * Returns the current record with the given id as Result
+     *
+     * @param int $id The id of the element
+     * @return Result The current element as a mysql result
+     */
+    public function getCurrentRecord($id): Result {
+        return Database::getInstance()
+            ->prepare('SELECT * FROM ' . $this->table . ' WHERE id = ?')
+            ->execute($id);
+    }
+
+
     /**
      * Collects all fields which should have the same values foro start and end 
      * tag, e.g. the show to guest only flag. See #30