updated etxlink, ctools, colorbox, computed_field
This commit is contained in:
@@ -86,7 +86,7 @@ function ctools_content_process(&$plugin, $info) {
|
||||
/**
|
||||
* Fetch metadata on a specific content_type plugin.
|
||||
*
|
||||
* @param $content type
|
||||
* @param mixed $content
|
||||
* Name of a panel content type.
|
||||
*
|
||||
* @return
|
||||
@@ -146,7 +146,7 @@ function ctools_content_get_subtypes($type) {
|
||||
if (is_array($function)) {
|
||||
$subtypes = $function;
|
||||
}
|
||||
else if (function_exists($function)) {
|
||||
elseif (function_exists($function)) {
|
||||
// Cast to array to prevent errors from non-array returns.
|
||||
$subtypes = (array) $function($plugin);
|
||||
}
|
||||
@@ -157,7 +157,7 @@ function ctools_content_get_subtypes($type) {
|
||||
foreach ($subtypes as $id => $subtype) {
|
||||
// Ensure that the 'subtype_id' value exists.
|
||||
if (!isset($subtype['subtype_id'])) {
|
||||
$subtype['subtype_id'] = $id;
|
||||
$subtypes[$id]['subtype_id'] = $id;
|
||||
}
|
||||
|
||||
// Use exact name since this is a modify by reference.
|
||||
@@ -207,6 +207,13 @@ function ctools_content_get_subtype($type, $subtype_id) {
|
||||
}
|
||||
|
||||
if ($subtype) {
|
||||
// Ensure that the 'subtype_id' value exists. This is also done in
|
||||
// ctools_content_get_subtypes(), but it wouldn't be called if the plugin
|
||||
// provides the subtype through its own function.
|
||||
if (!isset($subtype['subtype_id'])) {
|
||||
$subtype['subtype_id'] = $subtype_id;
|
||||
}
|
||||
|
||||
ctools_content_prepare_subtype($subtype, $plugin);
|
||||
}
|
||||
return $subtype;
|
||||
@@ -300,7 +307,7 @@ function ctools_content_render($type, $subtype, $conf, $keywords = array(), $arg
|
||||
$content->subtype = $subtype;
|
||||
}
|
||||
|
||||
// Override the title if configured to
|
||||
// Override the title if configured to.
|
||||
if (!empty($conf['override_title'])) {
|
||||
// Give previous title as an available substitution here.
|
||||
$keywords['%title'] = empty($content->title) ? '' : $content->title;
|
||||
@@ -310,12 +317,12 @@ function ctools_content_render($type, $subtype, $conf, $keywords = array(), $arg
|
||||
}
|
||||
|
||||
if (!empty($content->title)) {
|
||||
// Perform substitutions
|
||||
// Perform substitutions.
|
||||
if (!empty($keywords) || !empty($context)) {
|
||||
$content->title = ctools_context_keyword_substitute($content->title, $keywords, $context);
|
||||
}
|
||||
|
||||
// Sterilize the title
|
||||
// Sterilize the title.
|
||||
$content->title = filter_xss_admin($content->title);
|
||||
|
||||
// If a link is specified, populate.
|
||||
@@ -326,7 +333,7 @@ function ctools_content_render($type, $subtype, $conf, $keywords = array(), $arg
|
||||
else {
|
||||
$url = $content->title_link;
|
||||
}
|
||||
// set defaults so we don't bring up notices
|
||||
// Set defaults so we don't bring up notices.
|
||||
$url += array('href' => '', 'attributes' => array(), 'query' => array(), 'fragment' => '', 'absolute' => NULL, 'html' => TRUE);
|
||||
$content->title = l($content->title, $url['href'], $url);
|
||||
}
|
||||
@@ -348,7 +355,7 @@ function ctools_content_editable($type, $subtype, $conf) {
|
||||
}
|
||||
|
||||
$function = FALSE;
|
||||
|
||||
|
||||
if (!empty($subtype['check editable'])) {
|
||||
$function = ctools_plugin_get_function($subtype, 'check editable');
|
||||
}
|
||||
@@ -379,7 +386,7 @@ function ctools_content_admin_title($type, $subtype, $conf, $context = NULL) {
|
||||
if (is_array($type)) {
|
||||
$plugin = $type;
|
||||
}
|
||||
else if (is_string($type)) {
|
||||
elseif (is_string($type)) {
|
||||
$plugin = ctools_get_content_type($type);
|
||||
}
|
||||
else {
|
||||
@@ -397,10 +404,10 @@ function ctools_content_admin_title($type, $subtype, $conf, $context = NULL) {
|
||||
|
||||
return $function($subtype, $conf, $pane_context);
|
||||
}
|
||||
else if (isset($plugin['admin title'])) {
|
||||
elseif (isset($plugin['admin title'])) {
|
||||
return $plugin['admin title'];
|
||||
}
|
||||
else if (isset($plugin['title'])) {
|
||||
elseif (isset($plugin['title'])) {
|
||||
return $plugin['title'];
|
||||
}
|
||||
}
|
||||
@@ -435,7 +442,7 @@ function ctools_content_get_defaults($plugin, $subtype) {
|
||||
if (isset($plugin['defaults'])) {
|
||||
$defaults = $plugin['defaults'];
|
||||
}
|
||||
else if (isset($subtype['defaults'])) {
|
||||
elseif (isset($subtype['defaults'])) {
|
||||
$defaults = $subtype['defaults'];
|
||||
}
|
||||
if (isset($defaults)) {
|
||||
@@ -444,7 +451,7 @@ function ctools_content_get_defaults($plugin, $subtype) {
|
||||
return $return;
|
||||
}
|
||||
}
|
||||
else if (is_array($defaults)) {
|
||||
elseif (is_array($defaults)) {
|
||||
return $defaults;
|
||||
}
|
||||
}
|
||||
@@ -478,7 +485,7 @@ function ctools_content_admin_info($type, $subtype, $conf, $context = NULL) {
|
||||
|
||||
if (empty($output) || !is_object($output)) {
|
||||
$output = new stdClass();
|
||||
// replace the _ with " " for a better output
|
||||
// Replace the _ with " " for a better output.
|
||||
$subtype = check_plain(str_replace("_", " ", $subtype));
|
||||
$output->title = $subtype;
|
||||
$output->content = t('No info available.');
|
||||
@@ -487,7 +494,7 @@ function ctools_content_admin_info($type, $subtype, $conf, $context = NULL) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Add the default FAPI elements to the content type configuration form
|
||||
* Add the default FAPI elements to the content type configuration form.
|
||||
*/
|
||||
function ctools_content_configure_form_defaults($form, &$form_state) {
|
||||
$plugin = $form_state['plugin'];
|
||||
@@ -604,7 +611,7 @@ function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype_na
|
||||
if (!empty($subtype['add form'])) {
|
||||
_ctools_content_create_form_info($form_info, $subtype['add form'], $subtype, $subtype, $op);
|
||||
}
|
||||
else if (!empty($plugin['add form'])) {
|
||||
elseif (!empty($plugin['add form'])) {
|
||||
_ctools_content_create_form_info($form_info, $plugin['add form'], $plugin, $subtype, $op);
|
||||
}
|
||||
}
|
||||
@@ -614,7 +621,7 @@ function ctools_content_form($op, $form_info, &$form_state, $plugin, $subtype_na
|
||||
if (!empty($subtype['edit form'])) {
|
||||
_ctools_content_create_form_info($form_info, $subtype['edit form'], $subtype, $subtype, $op);
|
||||
}
|
||||
else if (!empty($plugin['edit form'])) {
|
||||
elseif (!empty($plugin['edit form'])) {
|
||||
_ctools_content_create_form_info($form_info, $plugin['edit form'], $plugin, $subtype, $op);
|
||||
}
|
||||
}
|
||||
@@ -633,7 +640,7 @@ function _ctools_content_create_form_info(&$form_info, $info, $plugin, $subtype,
|
||||
if (empty($subtype['title'])) {
|
||||
$title = t('Configure');
|
||||
}
|
||||
else if ($op == 'add') {
|
||||
elseif ($op == 'add') {
|
||||
$title = t('Configure new !subtype_title', array('!subtype_title' => $subtype['title']));
|
||||
}
|
||||
else {
|
||||
@@ -648,7 +655,7 @@ function _ctools_content_create_form_info(&$form_info, $info, $plugin, $subtype,
|
||||
),
|
||||
);
|
||||
}
|
||||
else if (is_array($info)) {
|
||||
elseif (is_array($info)) {
|
||||
$form_info['order'] = array();
|
||||
$form_info['forms'] = array();
|
||||
$count = 0;
|
||||
@@ -699,7 +706,7 @@ function ctools_content_get_available_types($contexts = NULL, $has_content = FAL
|
||||
|
||||
foreach ($plugins as $id => $plugin) {
|
||||
foreach (ctools_content_get_subtypes($plugin) as $subtype_id => $subtype) {
|
||||
// exclude items that require content if we're saying we don't
|
||||
// Exclude items that require content if we're saying we don't
|
||||
// provide it.
|
||||
if (!empty($subtype['requires content']) && !$has_content) {
|
||||
continue;
|
||||
@@ -739,7 +746,6 @@ function ctools_content_get_available_types($contexts = NULL, $has_content = FAL
|
||||
* Get an array of all content types that can be fed into the
|
||||
* display editor for the add content list, regardless of
|
||||
* availability.
|
||||
*
|
||||
*/
|
||||
function ctools_content_get_all_types() {
|
||||
$plugins = ctools_get_content_types();
|
||||
|
||||
Reference in New Issue
Block a user