From 3671b05828ea7af551d5b056b46c90e1f14e51e8 Mon Sep 17 00:00:00 2001 From: buttle Date: Tue, 4 May 2021 13:07:56 +0200 Subject: [PATCH] removes unnecessary site iteration --- src/View/Helper/ArchiveSiteMetaViewHelper.php | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/src/View/Helper/ArchiveSiteMetaViewHelper.php b/src/View/Helper/ArchiveSiteMetaViewHelper.php index c7f5db9..4b502de 100644 --- a/src/View/Helper/ArchiveSiteMetaViewHelper.php +++ b/src/View/Helper/ArchiveSiteMetaViewHelper.php @@ -56,26 +56,18 @@ class ArchiveSiteMetaViewHelper extends AbstractHelper } public function getCollections($sites){ - $collections = $this->omekaSettings->get('sitemeta_collections'); - $collection_options = []; - - foreach ( explode("\n", $collections) as $value ) { - $key_value = explode("=", str_replace(array("\r", "\n"), '',$value)); - $collection_options[trim($key_value[1])] = trim($key_value[0]); - } - //return $collections; - //$site = $sites[0]->setting('sitemeta_collections'); - //$collections = []; - $result = []; - foreach ($sites as $site) { - $settings = $this->getSiteMetaValues($site); - if ($settings && !in_array($settings['collection'], $result)) { - $name = $collection_options[$settings['collection']]; - $result[$settings['collection']] = $name; - //array_push($collections, $settings['collection']); + $sitemeta_collections = $this->omekaSettings->get('sitemeta_collections'); + $collections = []; + foreach ( explode("\n", $sitemeta_collections) as $value ) { + if ($value == "") { + continue; + } + $key_value = explode("=", str_replace(array("\r", "\n"), '', $value)); + if ($key_value) { + $collections[trim($key_value[1])] = trim($key_value[0]); } } - return $result; + return $collections; } public function getPages()