Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deprecated functions #145

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions profiles/panopoly/modules/contrib/ctools/includes/context.inc
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ctools_context {
var $restrictions = array();
var $empty = FALSE;

function ctools_context($type = 'none', $data = NULL) {
function __construct($type = 'none', $data = NULL) {
$this->type = $type;
$this->data = $data;
$this->title = t('Unknown context');
Expand Down Expand Up @@ -119,7 +119,7 @@ class ctools_context_required {
* @param ...
* One or more keywords to use for matching which contexts are allowed.
*/
function ctools_context_required($title) {
function __construct($title) {
$args = func_get_args();
$this->title = array_shift($args);

Expand Down Expand Up @@ -199,10 +199,6 @@ class ctools_context_required {
*/
class ctools_context_optional extends ctools_context_required {
var $required = FALSE;
function ctools_context_optional() {
$args = func_get_args();
call_user_func_array(array($this, 'ctools_context_required'), $args);
}

/**
* Add the 'empty' context which is possible for optional
Expand All @@ -211,7 +207,7 @@ class ctools_context_optional extends ctools_context_required {
$context = new ctools_context('any');
$context->title = t('No context');
$context->identifier = t('No context');
$contexts = array_merge(array('empty' => $context), $contexts);
$contexts['empty'] = $context;
}

function filter($contexts) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,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_add_html_head();
$this->css = drupal_add_css();
$this->tokens = ctools_set_page_token();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ class views_many_to_one_helper {
*/
public $placeholders = array();

function views_many_to_one_helper(&$handler) {
function __construct(&$handler) {
$this->handler = &$handler;
}

Expand Down
2 changes: 1 addition & 1 deletion profiles/panopoly/modules/contrib/views/includes/view.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2566,7 +2566,7 @@ class views_display extends views_db_object {
var $display_options;

var $db_table = 'views_display';
function views_display($init = TRUE) {
function __construct($init = TRUE) {
parent::init($init);
}

Expand Down