diff --git a/drupal/sites/default/boinc/modules/contrib/panels/includes/common.inc b/drupal/sites/default/boinc/modules/contrib/panels/includes/common.inc index 16ed3fdfce1..4415c94b754 100644 --- a/drupal/sites/default/boinc/modules/contrib/panels/includes/common.inc +++ b/drupal/sites/default/boinc/modules/contrib/panels/includes/common.inc @@ -89,13 +89,17 @@ class panels_allowed_layouts { * as allowed or not allowed on the initial call to panels_allowed_layouts::set_allowed() * */ - function panels_allowed_layouts($start_allowed = TRUE) { + function __construct($start_allowed = TRUE) { // TODO would be nice if there was a way to just fetch the names easily foreach ($this->list_layouts() as $layout_name) { $this->allowed_layout_settings[$layout_name] = $start_allowed ? 1 : 0; } } + function panels_allowed_layouts($start_allowed = TRUE) { + self::__construct($start_allowed); + } + /** * Manage panels_common_set_allowed_layouts(), the FAPI code for selecting allowed layouts. * diff --git a/drupal/sites/default/boinc/modules/contrib/panels/includes/plugins.inc b/drupal/sites/default/boinc/modules/contrib/panels/includes/plugins.inc index 19c464362af..17c896bf7f4 100644 --- a/drupal/sites/default/boinc/modules/contrib/panels/includes/plugins.inc +++ b/drupal/sites/default/boinc/modules/contrib/panels/includes/plugins.inc @@ -123,7 +123,7 @@ class panels_cache_object { /** * When constructed, take a snapshot of our existing out of band data. */ - function panels_cache_object() { + function __construct() { $this->head = drupal_set_html_head(); $this->css = drupal_add_css(); $this->tokens = ctools_set_page_token(); @@ -133,6 +133,9 @@ class panels_cache_object { } } + function panels_cache_object() { + self::__construct(); + } /** * Add content to the cache. This assumes a pure stream; * use set_content() if it's something else. diff --git a/drupal/sites/default/boinc/modules/contrib/panels/panels.info b/drupal/sites/default/boinc/modules/contrib/panels/panels.info index 7de62c8db78..09c0fa64003 100644 --- a/drupal/sites/default/boinc/modules/contrib/panels/panels.info +++ b/drupal/sites/default/boinc/modules/contrib/panels/panels.info @@ -5,8 +5,8 @@ package = "Panels" dependencies[] = ctools ; Information added by Drupal.org packaging script on 2016-02-25 -version = "6.x-3.12-boinc-2-dev" +version = "6.x-3.12-boinc-3-dev" core = "6.x" project = "panels" -datestamp = "1494600716" +datestamp = "1548705400" diff --git a/drupal/sites/default/boinc/modules/contrib/panels/panels.module b/drupal/sites/default/boinc/modules/contrib/panels/panels.module index c167e547dc3..52e57095196 100644 --- a/drupal/sites/default/boinc/modules/contrib/panels/panels.module +++ b/drupal/sites/default/boinc/modules/contrib/panels/panels.module @@ -594,12 +594,16 @@ class panels_display { var $did = 'new'; var $renderer; - function panels_display() { + function __construct() { // Set the default renderer to either the legacy or the standard renderer, // depending on the legacy rendering state $this->renderer = variable_get('panels_legacy_rendering_mode', TRUE) ? 'legacy' : 'standard'; } + function panels_display() { + self::__construct(); + } + function add_pane(&$pane, $location = NULL) { // If no location specified, use what's set in the pane. if (empty($location)) {