Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk
This commit is contained in:
commit
7aa496cd8a
@ -68,6 +68,8 @@ class FacebookAction extends Action
|
||||
$this->fbuid = $flink->foreign_id;
|
||||
$this->user = $flink->getUser();
|
||||
}
|
||||
|
||||
$this->args = array();
|
||||
}
|
||||
|
||||
function prepare($argarray)
|
||||
|
@ -57,7 +57,7 @@ function getFacebookBaseCSS()
|
||||
{
|
||||
# Add a timestamp to the CSS file so Facebook cache wont ignore our changes
|
||||
$ts = filemtime(INSTALLDIR.'/theme/base/css/facebookapp.base.css');
|
||||
$cssurl = INSTALLDIR.'/theme/base/css/facebookapp.base.css' . "?ts=$ts";
|
||||
$cssurl = theme_path('css/facebookapp.base.css', 'base') . "?ts=$ts";
|
||||
return $cssurl;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user