diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-02-16 11:48:34 -0200 | 
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-02-16 11:48:34 -0200 | 
| commit | b6ee1b93376d42f8a8fcee0127bc10f84d1e018e (patch) | |
| tree | cbde5e4d0b745c3bb854c215bccea8b2d6bb367e /mod/twitter_api/start.php | |
| parent | 694306cf537fb8cb45beb7d4fd63c5b56cb5c4da (diff) | |
| parent | 5aff5b3913fbb6226d8fb3162453c58888fba38d (diff) | |
| download | elgg-b6ee1b93376d42f8a8fcee0127bc10f84d1e018e.tar.gz elgg-b6ee1b93376d42f8a8fcee0127bc10f84d1e018e.tar.bz2  | |
Merge branch 'master' into saravea
Diffstat (limited to 'mod/twitter_api/start.php')
| -rw-r--r-- | mod/twitter_api/start.php | 9 | 
1 files changed, 6 insertions, 3 deletions
diff --git a/mod/twitter_api/start.php b/mod/twitter_api/start.php index 08bce5479..e6221de6b 100644 --- a/mod/twitter_api/start.php +++ b/mod/twitter_api/start.php @@ -20,6 +20,7 @@ function twitter_api_init() {  	//elgg_extend_view('metatags', 'twitter_api/metatags');  	elgg_extend_view('css/elgg', 'twitter_api/css');  	elgg_extend_view('css/admin', 'twitter_api/css'); +	elgg_extend_view('js/elgg', 'twitter_api/js');  	// sign on with twitter  	if (twitter_api_allow_sign_on_with_twitter()) { @@ -60,7 +61,7 @@ function twitter_api_pagehandler_deprecated($page) {   * Serves pages for twitter.   *   * @param array $page - * @return void + * @return bool   */  function twitter_api_pagehandler($page) {  	if (!isset($page[0])) { @@ -131,14 +132,15 @@ function twitter_api_tweet($hook, $type, $returnvalue, $params) {  	// send tweet  	$api = new TwitterOAuth($consumer_key, $consumer_secret, $access_key, $access_secret); -	$response = $api->post('statuses/update', array('status' => $params['message'])); +	$api->post('statuses/update', array('status' => $params['message']));  }  /**   * Get tweets for a user.   * - * @param int   $user_id The Elgg user GUID + * @param int   $user_guid The Elgg user GUID   * @param array $options + * @return array   */  function twitter_api_fetch_tweets($user_guid, $options = array()) {  	// check admin settings @@ -167,6 +169,7 @@ function twitter_api_fetch_tweets($user_guid, $options = array()) {   * @param string $type   * @param array  $return_value   * @param array  $params + * @return array   */  function twitter_api_public_pages($hook, $type, $return_value, $params) {  	$return_value[] = 'twitter_api/forward';  | 
