diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/htmloutputter.php | 9 | ||||
| -rw-r--r-- | lib/twitterapi.php | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php index 74876523a..2684baca6 100644 --- a/lib/htmloutputter.php +++ b/lib/htmloutputter.php @@ -370,13 +370,14 @@ class HTMLOutputter extends XMLOutputter */ function cssLink($src,$theme=null,$media=null) { - if (!$theme) { - $theme = common_config('site', 'theme'); - } $url = parse_url($src); if(! ($url->scheme || $url->host || $url->query || $url->fragment)) { - $src = theme_path($src) . '?version=' . LACONICA_VERSION; + if(file_exists(theme_file($src,$theme))){ + $src = theme_path($src, $theme) . '?version=' . LACONICA_VERSION; + }else{ + $src = common_path($src); + } } $this->element('link', array('rel' => 'stylesheet', 'type' => 'text/css', diff --git a/lib/twitterapi.php b/lib/twitterapi.php index 4115d9dcb..4737c5874 100644 --- a/lib/twitterapi.php +++ b/lib/twitterapi.php @@ -844,9 +844,9 @@ class TwitterapiAction extends Action $this->endXML(); } - function show_profile($profile, $content_type='xml', $notice=null) + function show_profile($profile, $content_type='xml', $notice=null, $includeStatuses=true) { - $profile_array = $this->twitter_user_array($profile, true); + $profile_array = $this->twitter_user_array($profile, $includeStatuses); switch ($content_type) { case 'xml': $this->show_twitter_xml_user($profile_array); |