Skip to content
Permalink
Browse files

updated a bug reported by lampelina

  • Loading branch information...
gresakg committed May 16, 2014
1 parent 175f1ae commit 184bbf945ab2727083e032cf139ccda00ac71ea1
Showing with 7 additions and 6 deletions.
  1. +7 −6 PHaiku/PHaiku.php
@@ -107,13 +107,14 @@ private function processArgs($args) {
protected function setBasicData() {
$filename = $this->getFilepath("_config","php");
if(file_exists($filename)) {
$data['site'] = (object) include $filename;
$base = include $filename;
}
$data['site']->baseurl = $this->getBaseUrl();
$data['site']->language = empty($this->lang)?$this->app->config("default.lang"):$this->lang;
$data['site']->template_url = $this->getBaseUrl().(trim($this->app->config("templates.path"),"."));
$data['site']->phaiku_version = self::$version;
$this->data = array_merge($this->data, $data);
$this->data['site']->appendArray($base);
$this->data['site']->baseurl = $this->getBaseUrl();
$this->data['site']->language = empty($this->lang)?$this->app->config("default.lang"):$this->lang;
$this->data['site']->template_url = $this->getBaseUrl().(trim($this->app->config("templates.path"),"."));
$this->data['site']->phaiku_version = self::$version;
//$this->data = array_merge($this->data, $data);
}
/**

1 comment on commit 184bbf9

@lampelina

This comment has been minimized.

Copy link

commented on 184bbf9 May 16, 2014

Up and running now, with multilingual set to false.

Please sign in to comment.
You can’t perform that action at this time.