Registry rewritten, exception added #2

[core.git] / inc / classes / main / criteria / search / class_SearchCriteria.php

diff --git a/inc/classes/main/criteria/search/class_SearchCriteria.php b/inc/classes/main/criteria/search/class_SearchCriteria.php
index 546efe85005006d38a89c4ba890e86fabb06a5b8..c6a955a814c41a9564d40c09a372e19bd550111e 100644 (file)
--- a/inc/classes/main/criteria/search/class_SearchCriteria.php
+++ b/inc/classes/main/criteria/search/class_SearchCriteria.php
@@ -6,7 +6,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -82,7 +82,7 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
         */
        public final function addConfiguredCriteria ($criteriaKey, $configEntry) {
                // Add the configuration entry as a criteria
-               $value = $this->getConfigInstance()->readConfig($configEntry);
+               $value = $this->getConfigInstance()->getConfigEntry($configEntry);
                $this->addCriteria($criteriaKey, $value);
        }
 
@@ -133,7 +133,7 @@ class SearchCriteria extends BaseCriteria implements LocalSearchCriteria {
         */
        public function getCacheKey () {
                // Initialize the key
-               $cacheKey = "";
+               $cacheKey = '';
 
                // Now walk through all criterias
                foreach ($this->searchCriteria as $criteriaKey => $criteriaValue) {