mikuli.cz

commit 1da8d029b634f3171eecedaf9d82ba2d192ad001
parent f0091e0516e37dc0ef082ad58f77c638ccc8a2f5
Author: markseu <mark2011@mayberg.se>
Date:   Wed,  8 Jul 2015 11:21:07 +0200

Core update (summer remix)

Diffstat:
M
README.md
 | 
15
+++++++--------
M
system/core/core.php
 | 
6
+++---

2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
@@ -1,17 +1,17 @@
-Yellow 0.5.24
+Yellow 0.5.25
 =============
-[![Yellow](https://raw.githubusercontent.com/wiki/datenstrom/yellow/images/yellow.jpg)](http://datenstrom.se/yellow)
-
+[![Yellow](https://raw.githubusercontent.com/wiki/datenstrom/yellow/images/yellow.jpg)](http://datenstrom.se/yellow)
+
 Yellow is for people who make websites. [Visit the Yellow website](http://datenstrom.se/yellow).
 
 How do I install this?
 ----------------------
 1. [Download Yellow and unzip it](https://github.com/datenstrom/yellow/archive/master.zip).  
 2. Copy all files to your web hosting.  
-3. Open your website in a web browser.
-
-Installing is unzipping one file and you are ready to go. [Learn more](https://github.com/datenstrom/yellow/wiki).
+3. Open your website in a web browser.
+
+Installing is unzipping one file and you are ready to go. [Learn more](https://github.com/datenstrom/yellow/wiki).
 
 License
 -------
-All files are licensed under [GPLv2](http://opensource.org/licenses/GPL-2.0) unless stated otherwise.
-\ No newline at end of file
+All files are licensed under [GPLv2](http://opensource.org/licenses/GPL-2.0) unless stated otherwise.
diff --git a/system/core/core.php b/system/core/core.php
@@ -5,7 +5,7 @@
 // Yellow main class
 class Yellow
 {
-	const Version = "0.5.24";
+	const Version = "0.5.25";
 	var $page;				//current page
 	var $pages;				//pages from file system
 	var $files;				//files from file system
@@ -1839,7 +1839,7 @@ class YellowLookup
 	// Return file path from location
 	function findFileFromLocation($location, $directory = false)
 	{
-		$path = $pathBase = $this->yellow->config->get("contentDir");
+		$path = $this->yellow->config->get("contentDir");
 		$pathRoot = $this->yellow->config->get("contentRootDir");
 		$pathHome = $this->yellow->config->get("contentHomeDir");
 		$fileDefault = $this->yellow->config->get("contentDefaultFile");
@@ -2067,7 +2067,7 @@ class YellowLookup
 	// Return content information
 	function getContentInformation()
 	{
-		$path = $pathBase = $this->yellow->config->get("contentDir");
+		$path = $this->yellow->config->get("contentDir");
 		$pathRoot = $this->yellow->config->get("contentRootDir");
 		$pathHome = $this->yellow->config->get("contentHomeDir");
 		if(!$this->yellow->config->get("multiLanguageMode")) $pathRoot = "";