Browse Source

Replace and with &&

pull/714/head
Jared Whiklo 7 years ago
parent
commit
c421256965
  1. 2
      includes/metadata.inc
  2. 4
      includes/solution_packs.inc

2
includes/metadata.inc

@ -107,7 +107,7 @@ function islandora_metadata_display_form(array $form, array $form_state) {
);
$form['viewers']['configuration'][$name] = array(
'#type' => 'item',
'#markup' => (isset($profile['configuration']) and $profile['configuration'] != '') ? l(t('configure'), $profile['configuration']) : '',
'#markup' => (isset($profile['configuration']) && $profile['configuration'] != '') ? l(t('configure'), $profile['configuration']) : '',
);
}
$form['viewers']['default'] = array(

4
includes/solution_packs.inc

@ -789,9 +789,9 @@ function theme_islandora_viewers_table($variables) {
*/
function islandora_get_viewer($params = NULL, $variable_id = NULL, AbstractObject $fedora_object = NULL) {
$settings = variable_get($variable_id, array());
if (!empty($settings) and $settings['default'] !== 'none') {
if (!empty($settings) && $settings['default'] !== 'none') {
$viewer_id = islandora_get_viewer_id($variable_id);
if ($viewer_id and $params !== NULL) {
if ($viewer_id && $params !== NULL) {
$callback = islandora_get_viewer_callback($viewer_id);
if (function_exists($callback)) {
return $callback($params, $fedora_object);

Loading…
Cancel
Save