Check for config variables first, than general to avoid a bug: If the same

[core.git] / inc / classes / main / reader / class_DefaultNewsReader.php

diff --git a/inc/classes/main/reader/class_DefaultNewsReader.php b/inc/classes/main/reader/class_DefaultNewsReader.php
index a0c4fb615205a4f72a8824f2e283a14e8a31bce0..29c325a3fa80e666633d8af557a7bcf5deae9abd 100644 (file)
--- a/inc/classes/main/reader/class_DefaultNewsReader.php
+++ b/inc/classes/main/reader/class_DefaultNewsReader.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -30,10 +30,6 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
        protected function __construct () {
                // Call parent constructor
                parent::__construct(__CLASS__);
-
-               // Clean up a little
-               $this->removeNumberFormaters();
-               $this->removeSystemArray();
        }
 
        /**
@@ -42,7 +38,7 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
         * @param       $requestInstance        An instance of a Requestable class
         * @return      $readerInstance         An instance of this reader class
         */
-       public final static function createDefaultNewsReader (Requestable $requestInstance) {
+       public static final function createDefaultNewsReader (Requestable $requestInstance) {
                // Get a new instance
                $readerInstance = new DefaultNewsReader();
 
@@ -54,13 +50,13 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
        }
 
        /**
-        * Initializes this reader class by pre-fetching news depending on "page"
+        * Initializes this reader class by pre-fetching news depending on 'page'
         * (outside or login area), which amount of news and how much to skip
         *
         * @return      void
         */
        public function initializeReader () {
-               // Get "page" for saving some calls
+               // Get 'page' for saving some calls
                $page = $this->getRequestInstance()->getRequestElement('page');
 
                // First get a wrapper instance
@@ -70,10 +66,10 @@ class DefaultNewsReader extends BaseFrameworkSystem implements ReadableNews, Reg
                $criteriaInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class');
 
                // Add the page as criteria to it at lease
-               $criteriaInstance->addCriteria("page", $page);
+               $criteriaInstance->addCriteria('page', $page);
 
                // Add limitation from config
-               $criteriaInstance->setLimit($this->getConfigInstance()->readConfig("news_{$page}_limit"));
+               $criteriaInstance->setConfiguredLimit('news_' . $page . '_limit');
 
                // Get a resultInstance back from the database
                $resultInstance = $wrapperInstance->doSelectByCriteria($criteriaInstance);