Commit 1c47cf42 authored by Artem Dotsenko's avatar Artem Dotsenko Committed by Damien McKenna
Browse files

Issue #1623536 by Artem Dotsenko: Avoid errors when updating object via entity APIs.

parent 00e94bf3

CHANGELOG.txt

+1 −0
Changes for CHANGELOG.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 
Panelizer 7.x-3.x-dev, xxxx-xx-xx

---------------------------------

#1623536 by Artem Dotsenko: Avoid errors when updating object via entity APIs.

#2246871 by DamienMcKenna: Body classes not output when using Panels Everywhere.

#1822136 by tim.plunkett: 'Use the same allowed layouts as standard Panels

  pages' option is ignored.

plugins/entity/PanelizerEntityDefault.class.php

+11 −0
Changes for plugins/entity/PanelizerEntityDefault.class.php: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -1106,6 +1106,17 @@ abstract class PanelizerEntityDefault implements PanelizerEntityInterface { 
        $view_mode = 'page_manager';

      }



      // In certain circumstances $panelizer will be the default's name rather

      // than a full object.

      if (!is_object($panelizer) && is_array($panelizer) && !empty($panelizer['name'])) {

        $panelizer = $this->get_default_panelizer_object($bundle . '.' . $view_mode, $panelizer['name']);

        $panelizer->did = NULL;



        // Ensure original values are maintained.

        $panelizer->entity_id = $entity_id;

        $panelizer->revision_id = $revision_id;

      }



      if ($this->supports_revisions) {

        if (empty($panelizer->revision_id) || $panelizer->revision_id != $revision_id) {

          $panelizer->revision_id = $revision_id;