Merge remote-tracking branch 'datenstrom/master'

This commit is contained in:
richi 2016-01-27 14:26:26 +01:00
commit e4d3c1665f
2 changed files with 7 additions and 3 deletions

View file

@ -5,7 +5,7 @@
// Command line plugin
class YellowCommandline
{
const Version = "0.6.4";
const Version = "0.6.5";
var $yellow; //access to API
var $files; //number of files
var $errors; //number of errors
@ -151,7 +151,7 @@ class YellowCommandline
{
$statusCode = max($statusCode, $this->buildStaticFile($path, $location));
}
$statusCode = max($statusCode, $this->buildStaticFile($path, "/error", false, false, true));
$statusCode = max($statusCode, $this->buildStaticFile($path, "/error/", false, false, true));
} else {
$statusCode = $this->buildStaticFile($path, $location);
}
@ -163,6 +163,7 @@ class YellowCommandline
// Build static file
function buildStaticFile($path, $location, $analyse = false, $probe = false, $error = false)
{
$this->yellow->pages = new YellowPages($this->yellow);
$this->yellow->page = new YellowPage($this->yellow);
$this->yellow->page->fileName = substru($location, 1);
if(!is_readable($this->yellow->page->fileName))

View file

@ -2322,7 +2322,10 @@ class YellowToolbox
$_REQUEST[$matches[1]] = $matches[2];
}
}
}
} else {
$_SERVER["LOCATION"] = $location;
$_SERVER["LOCATION_ARGS"] = "";
}
return $location;
}