Merge branch 'test'
This commit is contained in:
commit
b009bc4c3e
5 changed files with 14 additions and 3 deletions
9
.travis.yml
Normal file
9
.travis.yml
Normal file
|
@ -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,6 +2,8 @@ Yellow
|
|||
======
|
||||
|
||||
Yellow is a CMS **for people** who make websites.
|
||||
|
||||
[](https://travis-ci.org/markseu/yellowcms)
|
||||
|
||||
How do I install this?
|
||||
----------------------
|
||||
|
|
|
@ -28,4 +28,4 @@ contentDefaultFile = page.txt
|
|||
contentExtension = .txt
|
||||
configExtension = .ini
|
||||
errorPageFile = error(.*).txt
|
||||
textStringFile = text(.*).ini
|
||||
textStringFile = text(.*).ini
|
||||
|
|
|
@ -17,4 +17,4 @@ webinterfaceUserLogout = Logout
|
|||
webinterface424Title = New page
|
||||
webinterface424Text = Write text here
|
||||
paginationPrevious = ← Previous
|
||||
paginationNext = Next →
|
||||
paginationNext = Next →
|
||||
|
|
|
@ -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");
|
||||
|
|
Loading…
Add table
Reference in a new issue