From 054a83e77ee1197d62b9082b5e92e47c57574e53 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Sun, 14 Aug 2005 07:22:36 +0000 Subject: [PATCH] don't produce warnings in get() if the item is missing --- includes/SiteConfiguration.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php index 6aa7d4506e..89cf746547 100644 --- a/includes/SiteConfiguration.php +++ b/includes/SiteConfiguration.php @@ -23,15 +23,20 @@ class SiteConfiguration { /** */ function get( $setting, $wiki, $suffix, $params = array() ) { - if ( array_key_exists( $wiki, $this->settings[$setting] ) ) { - $retval = $this->settings[$setting][$wiki]; - } elseif ( array_key_exists( $suffix, $this->settings[$setting] ) ) { - $retval = $this->settings[$setting][$suffix]; - } elseif ( array_key_exists( 'default', $this->settings[$setting] ) ) { - $retval = $this->settings[$setting]['default']; + if ( array_key_exists( $setting, $this->settings ) ) { + if ( array_key_exists( $wiki, $this->settings[$setting] ) ) { + $retval = $this->settings[$setting][$wiki]; + } elseif ( array_key_exists( $suffix, $this->settings[$setting] ) ) { + $retval = $this->settings[$setting][$suffix]; + } elseif ( array_key_exists( 'default', $this->settings[$setting] ) ) { + $retval = $this->settings[$setting]['default']; + } else { + $retval = NULL; + } } else { $retval = NULL; } + if ( !is_null( $retval ) && count( $params ) ) { foreach ( $params as $key => $value ) { $retval = str_replace( '$' . $key, $value, $retval ); -- 2.20.1