aboutsummaryrefslogtreecommitdiffstats
path: root/addon/twitter
diff options
context:
space:
mode:
authorTobias Diekershoff <tobias.diekershoff@gmx.net>2011-03-13 11:37:24 +0100
committerTobias Diekershoff <tobias.diekershoff@gmx.net>2011-03-13 11:37:24 +0100
commita2ee5ebe427522228dc03dc81da11f348a399c4d (patch)
tree8bffe9c8c9abe370523816f7742e6e26364fa5b5 /addon/twitter
parent8fea19dd38cf9c43bb6f6fa1a4f349555cbe90f8 (diff)
parenta912a0d3cae0ae9c873dcb5c45624a725bd2c2d6 (diff)
downloadvolse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.tar.gz
volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.tar.bz2
volse-hubzilla-a2ee5ebe427522228dc03dc81da11f348a399c4d.zip
Merge branch 'master' of git://github.com/friendika/friendika
Conflicts: addon/twitter/twitter.php
Diffstat (limited to 'addon/twitter')
-rw-r--r--addon/twitter/twitter.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 678da9388..93aca3129 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -59,7 +59,7 @@ function twitter_jot_nets(&$a,&$b) {
$tw_post = get_pconfig(local_user(),'twitter','post');
if(intval($tw_post) == 1) {
$tw_defpost = get_pconfig(local_user(),'twitter','post_by_default');
- $selected = ((intval($tw_defpost == 1)) ? ' selected="selected" ' : '');
+ $selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . 'value="1" /> '
. t('Post to Twitter') . '</div>';
}
@@ -138,7 +138,11 @@ function twitter_settings(&$a,&$s) {
* which the user can request a PIN to connect the account to a
* account at Twitter.
*/
+<<<<<<< HEAD
require_once('library/twitteroauth.php');
+=======
+ require_once('library/twitteroauth.php');
+>>>>>>> a912a0d3cae0ae9c873dcb5c45624a725bd2c2d6
$connection = new TwitterOAuth($ckey, $csecret);
$request_token = $connection->getRequestToken();
$token = $request_token['oauth_token'];