0ct0pu5/yellow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Core update (summer remix)

Browse source
This commit is contained in:
markseu 2015-07-08 11:21:07 +02:00
parent f0091e0516
commit 1da8d029b6
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
README.md
View file

@ -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.
All files are licensed under [GPLv2](http://opensource.org/licenses/GPL-2.0) unless stated otherwise.

6
system/core/core.php
View file

@ -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 = "";