Merge branch 'master' into feature/unitTests

PhileCMS · Aug 21, 2014 · fcf2e09 · fcf2e09
2 parents 772b662 + c1f1356
commit fcf2e09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -3,6 +3,7 @@
 ## Release v1.2.1
 
 - [x] [XXXXXXX](https://github.com/PhileCMS/Phile/commit/) by Frank Nägler - refactoring of bootstrapping and adding travis ci
+- [ ] [XXXXXXX](https://github.com/PhileCMS/Phile/commit/) by Stijn-Flipper - [BUGFIX] Make sorting *actually* works after release v1.2.0
 
 ## Release v1.2.0
 

diff --git a/lib/Phile/Repository/Page.php b/lib/Phile/Repository/Page.php
@@ -37,9 +37,8 @@ class Page {
 	 * the constructor
 	 */
 	public function __construct($settings = null) {
-		if ($settings === null) {
-			$this->settings = \Phile\Registry::get('Phile_Settings');
-		}
+		$this->settings = ($settings === null) ? \Phile\Registry::get('Phile_Settings') : $settings;
+
 		if (ServiceLocator::hasService('Phile_Cache')) {
 			$this->cache = ServiceLocator::getService('Phile_Cache');
 		}