aboutsummaryrefslogtreecommitdiffstats
path: root/include/api.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-10-28 16:58:13 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-10-28 16:58:13 -0700
commit06ec5424c763f3dce0029d0b5ff5c47b94abdf7b (patch)
tree2ba28ecd8029fd6b8089ffdb5fc278712f1669d5 /include/api.php
parent612efe56f16955a9c202193fe246789825e939db (diff)
downloadvolse-hubzilla-06ec5424c763f3dce0029d0b5ff5c47b94abdf7b.tar.gz
volse-hubzilla-06ec5424c763f3dce0029d0b5ff5c47b94abdf7b.tar.bz2
volse-hubzilla-06ec5424c763f3dce0029d0b5ff5c47b94abdf7b.zip
restrict sslify to img tags by default - set config system.sslify_everything if you want to proxy media files also.
Diffstat (limited to 'include/api.php')
-rw-r--r--include/api.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/api.php b/include/api.php
index 73f4f57d0..ad29625d8 100644
--- a/include/api.php
+++ b/include/api.php
@@ -75,8 +75,9 @@ require_once('include/attach.php');
try {
$oauth = new FKOAuth1();
$req = OAuthRequest::from_request();
+
list($consumer,$token) = $oauth->verify_request($req);
-// list($consumer,$token) = $oauth->verify_request(OAuthRequest::from_request());
+
if (!is_null($token)){
$oauth->loginUser($token->uid);