GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch 'master' into testing

Browse Source
This commit is contained in:
Brion Vibber 2010-02-17 10:13:35 -08:00
commit 3cb6b1670b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/htmloutputter.php
View File

@ -439,7 +439,7 @@ class HTMLOutputter extends XMLOutputter
{ {
if(Event::handle('StartCssLinkElement', array($this,&$src,&$theme,&$media))) { if(Event::handle('StartCssLinkElement', array($this,&$src,&$theme,&$media))) {
$url = parse_url($src); $url = parse_url($src);
if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) if( empty($url['scheme']) && empty($url['host']) && empty($url['query']) && empty($url['fragment']))
{ {
if(file_exists(Theme::file($src,$theme))){ if(file_exists(Theme::file($src,$theme))){
$src = Theme::path($src, $theme); $src = Theme::path($src, $theme);

2
plugins/Minify/MinifyPlugin.php
View File

@ -96,7 +96,7 @@ class MinifyPlugin extends Plugin
&& is_null(common_config('theme', 'path')) && is_null(common_config('theme', 'path'))
&& is_null(common_config('theme', 'server')); && is_null(common_config('theme', 'server'));
$url = parse_url($src); $url = parse_url($src);
if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) if( empty($url['scheme']) && empty($url['host']) && empty($url['query']) && empty($url['fragment']))
{ {
if(!isset($theme)) { if(!isset($theme)) {
$theme = common_config('site', 'theme'); $theme = common_config('site', 'theme');