updated ctools, needed by panles
This commit is contained in:
@@ -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');
|
||||
@@ -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);
|
||||
|
||||
@@ -204,10 +204,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
|
||||
@@ -1163,7 +1159,7 @@ function ctools_context_match_required_contexts($required, $contexts) {
|
||||
}
|
||||
|
||||
foreach ($required as $r) {
|
||||
$context = clone(array_shift($contexts));
|
||||
$context = clone array_shift($contexts);
|
||||
$context->identifier = $r['identifier'];
|
||||
$context->page_title = isset($r['title']) ? $r['title'] : '';
|
||||
$context->keyword = $r['keyword'];
|
||||
|
||||
Reference in New Issue
Block a user