浏览代码

Merge branch 'test'

markseu 11 年之前
父节点
当前提交
b009bc4c3e
共有 5 个文件被更改,包括 14 次插入3 次删除
  1. 9 0
      .travis.yml
  2. 2 0
      README.md
  3. 1 1
      system/config/config.ini
  4. 1 1
      system/config/textenglish.ini
  5. 1 1
      system/core/core-commandline.php

+ 9 - 0
.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

+ 2 - 0
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?
 ----------------------

+ 1 - 1
system/config/config.ini

@@ -28,4 +28,4 @@ contentDefaultFile = page.txt
 contentExtension = .txt
 configExtension = .ini
 errorPageFile = error(.*).txt
-textStringFile = text(.*).ini
+textStringFile = text(.*).ini

+ 1 - 1
system/config/textenglish.ini

@@ -17,4 +17,4 @@ webinterfaceUserLogout		= Logout
 webinterface424Title		= New page
 webinterface424Text			= Write text here
 paginationPrevious			= ← Previous
-paginationNext				= Next →
+paginationNext				= Next →

+ 1 - 1
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");