mikuli.cz

commit 059d386f0c5e9ff7fd897ccec1ac7427ec31b1f0
parent e885d5f321628604c8f90bb01e59fea85a752778
Author: markseu <mark2011@mayberg.se>
Date:   Thu, 30 Apr 2015 21:32:58 +0200

Web interface update (new page fix for Juh)

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

3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-Yellow 0.5.3
+Yellow 0.5.4
 ============
 [![Yellow](https://raw.githubusercontent.com/wiki/datenstrom/yellow/images/yellow.jpg)](http://datenstrom.se/yellow)
 
diff --git a/system/core/core-webinterface.php b/system/core/core-webinterface.php
@@ -5,7 +5,7 @@
 // Web interface core plugin
 class YellowWebinterface
 {
-	const Version = "0.5.3";
+	const Version = "0.5.4";
 	var $yellow;				//access to API
 	var $active;				//web interface is active? (boolean)
 	var $userLoginFailed;		//web interface login failed? (boolean)
@@ -452,8 +452,8 @@ class YellowWebinterface
 	{
 		$fileName = $this->yellow->lookup->findFileFromLocation($this->yellow->page->location);
 		$fileName = $this->yellow->lookup->findFileNew($fileName,
-			$this->yellow->config->get("configDir"), $this->yellow->config->get("webinterfaceNewFile"),
-			$this->yellow->config->get("contentDefaultFile"));
+			$this->yellow->config->get("webinterfaceNewFile"), $this->yellow->config->get("configDir"),
+			$this->yellow->config->get("template"));
 		$fileData = $this->yellow->toolbox->getFileData($fileName);
 		$fileData = preg_replace("/@datetime/i", date("Y-m-d H:i:s"), $fileData);
 		$fileData = preg_replace("/@date/i", date("Y-m-d"), $fileData);
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.3";
+	const Version = "0.5.4";
 	var $page;				//current page
 	var $pages;				//pages from file system
 	var $files;				//files from file system
@@ -1928,13 +1928,13 @@ class YellowLookup
 	}
 	
 	// Return file path for new page
-	function findFileNew($fileName, $pathBase, $fileNew, $fileDefault)
+	function findFileNew($fileName, $fileNew, $pathBase, $nameDefault)
 	{
 		if(preg_match("/^.*\/(.+?)$/", dirname($fileName), $matches)) $name = $this->normaliseName($matches[1]);
 		$fileName = strreplaceu("(.*)", $name, $pathBase.$fileNew);
 		if(!is_file($fileName))
 		{
-			$name = $this->normaliseName($fileDefault, true, true);
+			$name = $this->normaliseName($nameDefault);
 			$fileName = strreplaceu("(.*)", $name, $pathBase.$fileNew);
 		}
 		return $fileName;