Merge branch 'tobiasd-master'

This commit is contained in:
Friendika 2011-03-25 15:11:22 -07:00
commit ff8bddb4a8
2 changed files with 2 additions and 2 deletions

View file

@ -138,7 +138,7 @@ function twitter_settings(&$a,&$s) {
* which the user can request a PIN to connect the account to a * which the user can request a PIN to connect the account to a
* account at Twitter. * account at Twitter.
*/ */
require_once('library/twitteroauth.php'); require_once('library/twitteroauth.php');
$connection = new TwitterOAuth($ckey, $csecret); $connection = new TwitterOAuth($ckey, $csecret);
$request_token = $connection->getRequestToken(); $request_token = $connection->getRequestToken();
$token = $request_token['oauth_token']; $token = $request_token['oauth_token'];

View file

@ -2,7 +2,7 @@
/* green variation by Tobias Diekershoff <tobias.diekershoff@gmx.net> */ /* green variation by Tobias Diekershoff <tobias.diekershoff@gmx.net> */
a, a:visited { color: #549f4f; text-decoration: none; } a:link, a:visited { color: #549f4f; text-decoration: none; }
a:hover {text-decoration: underline; } a:hover {text-decoration: underline; }