mikuli.cz

commit d23e65764f57c57c900baab846502fc854986965
parent c124aad12cd9005d567b2c9c6d3ecfce342d1e46
Author: markseu <mark2011@mayberg.se>
Date:   Sun,  1 Dec 2013 21:24:34 +0100

Automated tests

Diffstat:
A
.travis.yml
 | 
9
+++++++++
M
README.md
 | 
2
++
M
system/config/config.ini
 | 
3
+--
M
system/config/textenglish.ini
 | 
3
+--
M
system/core/core-commandline.php
 | 
2
+-

5 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,9 @@
+language: php
+php:
+  - 5.5
+  - 5.4
+  - 5.3
+before_script: 
+  - echo "serverName = your.domain.name" >> system/config/config.ini
+  - cat system/config/config.ini
+script: php yellow.php build test
diff --git a/README.md b/README.md
@@ -2,6 +2,8 @@ Yellow
 ======
 
 Yellow is a CMS **for people** who make websites.
+
+[![Build Status](https://secure.travis-ci.org/markseu/yellowcms.png)](https://travis-ci.org/markseu/yellowcms)
 
 How do I install this?
 ----------------------
diff --git a/system/config/config.ini b/system/config/config.ini
@@ -28,4 +28,4 @@ contentDefaultFile = page.txt
 contentExtension = .txt
 configExtension = .ini
 errorPageFile = error(.*).txt
-textStringFile = text(.*).ini
-\ No newline at end of file
+textStringFile = text(.*).ini
diff --git a/system/config/textenglish.ini b/system/config/textenglish.ini
@@ -17,4 +17,4 @@ webinterfaceUserLogout		= Logout
 webinterface424Title		= New page
 webinterface424Text			= Write text here
 paginationPrevious			= ← Previous
-paginationNext				= Next →
-\ No newline at end of file
+paginationNext				= Next →
diff --git a/system/core/core-commandline.php b/system/core/core-commandline.php
@@ -54,7 +54,7 @@ class YellowCommandline
 		list($name, $command, $path, $location) = $args;
 		if(!empty($path) && $path!="/")
 		{
-			if($this->yellow->config->isExisting("serverName") && $this->yellow->config->isExisting("serverBase"))
+			if($this->yellow->config->isExisting("serverName"))
 			{
 				$serverName = $this->yellow->config->get("serverName");
 				$serverBase = $this->yellow->config->get("serverBase");