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

Merge branch 'master' of evan@dev.controlyourself.ca:/var/www/trunk

Browse Source
This commit is contained in:
Evan Prodromou 2009-01-23 08:23:40 +01:00
commit 7aa496cd8a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/facebookaction.php
View File

@ -68,6 +68,8 @@ class FacebookAction extends Action
$this->fbuid = $flink->foreign_id; $this->fbuid = $flink->foreign_id;
$this->user = $flink->getUser(); $this->user = $flink->getUser();
} }
$this->args = array();
} }
function prepare($argarray) function prepare($argarray)

2
lib/facebookutil.php
View File

@ -57,7 +57,7 @@ function getFacebookBaseCSS()
{ {
# Add a timestamp to the CSS file so Facebook cache wont ignore our changes # Add a timestamp to the CSS file so Facebook cache wont ignore our changes
$ts = filemtime(INSTALLDIR.'/theme/base/css/facebookapp.base.css'); $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; return $cssurl;
} }