diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-27 19:27:38 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-27 19:27:38 -0700 |
| commit | b381ec57346a6d7724b2317c120ce2e6e70edc37 (patch) | |
| tree | e2cf66e01a87e438241e5bfac5daf6e7d3046b71 /include/oauth.php | |
| parent | 675aa96f222877a5aa543b8409a2c580cf10d3aa (diff) | |
| parent | 11301d51a58d04843ba3056b4c9e92d59ced1334 (diff) | |
| download | volse-hubzilla-b381ec57346a6d7724b2317c120ce2e6e70edc37.tar.gz volse-hubzilla-b381ec57346a6d7724b2317c120ce2e6e70edc37.tar.bz2 volse-hubzilla-b381ec57346a6d7724b2317c120ce2e6e70edc37.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
mod/impel.php
Diffstat (limited to 'include/oauth.php')
| -rw-r--r-- | include/oauth.php | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/oauth.php b/include/oauth.php index a9509c68e..80336f906 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -175,16 +175,8 @@ class FKOAuth1 extends OAuthServer { if(strlen($a->channel['channel_timezone'])) { date_default_timezone_set($a->channel['channel_timezone']); -// $a->timezone = $a->user['timezone']; } -// $r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1", -// intval($_SESSION['uid'])); -// if(count($r)) { -// $a->contact = $r[0]; -// $a->cid = $r[0]['id']; -// $_SESSION['cid'] = $a->cid; -// } // q("UPDATE `user` SET `login_date` = '%s' WHERE `uid` = %d LIMIT 1", // dbesc(datetime_convert()), // intval($_SESSION['uid']) |