From c42125696510605bc42001120fca8e7808f95dce Mon Sep 17 00:00:00 2001 From: Jared Whiklo Date: Tue, 29 Jan 2019 14:49:35 -0600 Subject: [PATCH] Replace and with && --- includes/metadata.inc | 2 +- includes/solution_packs.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/metadata.inc b/includes/metadata.inc index 95ae4202..5e298127 100644 --- a/includes/metadata.inc +++ b/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( diff --git a/includes/solution_packs.inc b/includes/solution_packs.inc index 1c38dc79..d813e067 100644 --- a/includes/solution_packs.inc +++ b/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);