D3Public/daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

Merge pull request #227 from CatiaFerreira6/develop_fix_static

Browse Source 
Fix that addresses latest comment in #225 for serving static assets
This commit is contained in:
Denis Kisselev 2014-10-25 14:42:58 -07:00
commit 671dd6a564
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/daux.php
View File

@ -74,8 +74,10 @@
} }
$this->mode = Daux::LIVE_MODE; $this->mode = Daux::LIVE_MODE;
$this->host = $_SERVER['HTTP_HOST']; $this->host = $_SERVER['HTTP_HOST'];
$this->base_url = $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']; //Fixes for pages within pages
$this->base_url = substr($this->base_url, 0, strrpos($this->base_url, '/')); //$this->base_url = $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
$this->base_url = $_SERVER['HTTP_HOST'];
//$this->base_url = substr($this->base_url, 0, strrpos($this->base_url, '/'));
//adding this replace, which replaces the /index.php with nothing seems to resolve the issue with serving static content //adding this replace, which replaces the /index.php with nothing seems to resolve the issue with serving static content
$this->base_url = str_replace("/index.php", "", $this->base_url); $this->base_url = str_replace("/index.php", "", $this->base_url);
} }
@ -301,7 +303,7 @@
$params['template'] = $this->options['template']; $params['template'] = $this->options['template'];
$params['theme'] = DauxHelper::configure_theme($this->local_base . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR . $params['theme'] = DauxHelper::configure_theme($this->local_base . DIRECTORY_SEPARATOR . 'templates' . DIRECTORY_SEPARATOR .
$this->options['template'] . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $this->options['theme'] . '.thm', $params['base_url'], $this->options['template'] . DIRECTORY_SEPARATOR . 'themes' . DIRECTORY_SEPARATOR . $this->options['theme'] . '.thm', $params['base_url'],
$this->local_base, $params['base_url'] . "templates/" . $params['template'] . "/themes/" . $this->options['theme'] . '/', $mode); $this->local_base, $params['base_url'] . "templates/" . $params['template'] . "/themes/" . $this->options['theme'] . '/', $mode);
if ($params['breadcrumbs'] = $this->options['breadcrumbs']) if ($params['breadcrumbs'] = $this->options['breadcrumbs'])
$params['breadcrumb_separator'] = $this->options['breadcrumb_separator']; $params['breadcrumb_separator'] = $this->options['breadcrumb_separator'];