mikuli.cz

commit 929af69d74fcb99a20c61afade8a6647b95aed63
parent de63d771c753832f350242c0f4c6fff099638245
Author: markseu <mark2011@mayberg.se>
Date:   Tue,  6 Jan 2015 17:21:35 +0100

Core update (multi language dust removal)

Diffstat:
M
README.md
 | 
2
+-
M
system/core/core.php
 | 
8
++++----

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Yellow 0.4.17
+Yellow 0.4.18
 =============
 [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/markseu/yellowcms) 
 
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
 // Yellow main class
 class Yellow
 {
-	const Version = "0.4.17";
+	const Version = "0.4.18";
 	var $page;				//current page
 	var $pages;				//pages from file system
 	var $config;			//configuration
@@ -879,9 +879,9 @@ class YellowPages
 	}
 	
 	// Return page collection with all pages from file system
-	function index($showInvisible = false, $showLanguages = false, $levelMax = 0)
+	function index($showInvisible = false, $showMulti = false, $levelMax = 0)
 	{
-		$rootLocation = $showLanguages ? "" : $this->getRootLocation($this->yellow->page->location);
+		$rootLocation = $showMulti ? "" : $this->getRootLocation($this->yellow->page->location);
 		return $this->findChildrenRecursive($rootLocation, $showInvisible, $levelMax);
 	}
 	
@@ -907,7 +907,7 @@ class YellowPages
 	}
 	
 	// Return page collection with multiple languages
-	function translation($location, $absoluteLocation = false, $showInvisible = false)
+	function multi($location, $absoluteLocation = false, $showInvisible = false)
 	{
 		$pages = new YellowPageCollection($this->yellow);
 		if($absoluteLocation) $location = substru($location, strlenu($this->yellow->page->base));