diff options
| author | sarven <csarven@plantard.controlezvous.ca> | 2009-01-23 08:19:16 +0000 |
|---|---|---|
| committer | sarven <csarven@plantard.controlezvous.ca> | 2009-01-23 08:19:16 +0000 |
| commit | 843358be44b9b107441cbc2e35d7794343762fb0 (patch) | |
| tree | 13340f691c0896611dacc07ac613750574898fd3 /lib | |
| parent | 50b9f5f6c55d13666da1d2ca03c583282e9afa55 (diff) | |
| parent | 85321cede0abba7a5d08fad7fcb348d1bacc98b3 (diff) | |
Merge branch 'master' of ../trunk
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/facebookaction.php | 2 | ||||
| -rw-r--r-- | lib/facebookutil.php | 2 | ||||
| -rw-r--r-- | lib/searchgroupnav.php | 2 | ||||
| -rw-r--r-- | lib/twitter.php | 2 | ||||
| -rw-r--r-- | lib/util.php | 2 |
5 files changed, 8 insertions, 2 deletions
diff --git a/lib/facebookaction.php b/lib/facebookaction.php index a20e618d3..2dbe15970 100644 --- a/lib/facebookaction.php +++ b/lib/facebookaction.php @@ -68,6 +68,8 @@ class FacebookAction extends Action $this->fbuid = $flink->foreign_id; $this->user = $flink->getUser(); } + + $this->args = array(); } function prepare($argarray) diff --git a/lib/facebookutil.php b/lib/facebookutil.php index 81737e4d5..a2a2d7cb1 100644 --- a/lib/facebookutil.php +++ b/lib/facebookutil.php @@ -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; } diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php index 4ea226692..9fe3c2379 100644 --- a/lib/searchgroupnav.php +++ b/lib/searchgroupnav.php @@ -81,6 +81,8 @@ class SearchGroupNav extends Widget _('Find people on this site'), $action_name == 'peoplesearch', 'nav_search_people'); $this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'), _('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice'); + $this->out->menuItem(common_local_url('groupsearch', $args), _('Group'), + _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_notice'); $this->action->elementEnd('ul'); } } diff --git a/lib/twitter.php b/lib/twitter.php index 5eb15005a..197298549 100644 --- a/lib/twitter.php +++ b/lib/twitter.php @@ -42,7 +42,7 @@ function get_twitter_data($uri, $screen_name, $password) $errmsg = curl_error($ch); if ($errmsg) { - common_debug("Twitter bridge - cURL error: $errmsg - trying to load: $uri with user $twit_user.", + common_debug("Twitter bridge - cURL error: $errmsg - trying to load: $uri with user $screen_name.", __FILE__); } diff --git a/lib/util.php b/lib/util.php index 0b5abfa48..4b77f7c19 100644 --- a/lib/util.php +++ b/lib/util.php @@ -823,6 +823,8 @@ function common_fancy_url($action, $args=null) return common_path('settings/im'); case 'avatarsettings': return common_path('settings/avatar'); + case 'groupsearch': + return common_path('search/group' . (($args) ? ('?' . http_build_query($args)) : '')); case 'peoplesearch': return common_path('search/people' . (($args) ? ('?' . http_build_query($args)) : '')); case 'noticesearch': |