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

Merge commit 'refs/merge-requests/108' of git://gitorious.org/statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber 2009-12-04 12:23:33 -08:00
commit 4afe07f0c3
2 changed files with 45 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
EVENTS.txt
View File

@ -574,3 +574,24 @@ EndShortenUrl: After a URL has been shortened
- $shortenerName: name of the requested shortener - $shortenerName: name of the requested shortener
- $shortenedUrl: short version of the url - $shortenedUrl: short version of the url
StartCssLinkElement: Before a <link rel="stylesheet"..> element is written
- $action
- &$src
- &$theme
- &$media
EndCssLinkElement: After a <link rel="stylesheet"..> element is written
- $action
- $src
- $theme
- $media
StartScriptElement: Before a <script...> element is written
- $action
- &$src
- &$type
EndScriptElement: After a <script...> element is written
- $action
- $src
- $type

42
lib/htmloutputter.php
View File

@ -350,14 +350,17 @@ class HTMLOutputter extends XMLOutputter
*/ */
function script($src, $type='text/javascript') function script($src, $type='text/javascript')
{ {
$url = parse_url($src); if(Event::handle('StartScriptElement', array($this,&$src,&$type))) {
if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) $url = parse_url($src);
{ if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
$src = common_path($src) . '?version=' . STATUSNET_VERSION; {
$src = common_path($src) . '?version=' . STATUSNET_VERSION;
}
$this->element('script', array('type' => $type,
'src' => $src),
' ');
Event::handle('EndScriptElement', array($this,$src,$type));
} }
$this->element('script', array('type' => $type,
'src' => $src),
' ');
} }
/** /**
@ -390,19 +393,22 @@ class HTMLOutputter extends XMLOutputter
*/ */
function cssLink($src,$theme=null,$media=null) function cssLink($src,$theme=null,$media=null)
{ {
$url = parse_url($src); if(Event::handle('StartCssLinkElement', array($this,&$src,&$theme,&$media))) {
if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment)) $url = parse_url($src);
{ if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
if(file_exists(Theme::file($src,$theme))){ {
$src = Theme::path($src, $theme) . '?version=' . STATUSNET_VERSION; if(file_exists(Theme::file($src,$theme))){
}else{ $src = Theme::path($src, $theme) . '?version=' . STATUSNET_VERSION;
$src = common_path($src); }else{
$src = common_path($src);
}
} }
$this->element('link', array('rel' => 'stylesheet',
'type' => 'text/css',
'href' => $src,
'media' => $media));
Event::handle('EndCssLinkElement', array($this,$src,$theme,$media));
} }
$this->element('link', array('rel' => 'stylesheet',
'type' => 'text/css',
'href' => $src,
'media' => $media));
} }
/** /**