summaryrefslogtreecommitdiff
path: root/classes/Profile.php
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-10-19 21:01:53 -0700
committerZach Copley <zach@status.net>2010-10-19 21:01:53 -0700
commit5ca29ab0de22b5d8167af5adb320d6acdda807b7 (patch)
treec73aae0a1c9fe600dd38294d5e5e148c94252d1b /classes/Profile.php
parentd464ebfc12e34c8742a80622e8aace46f4a963ae (diff)
parente8b6d7c946da5fb2ce5397bccfd332de8ca1f9dd (diff)
Merge branch 'anon-consumer' into 0.9.x
Diffstat (limited to 'classes/Profile.php')
-rw-r--r--classes/Profile.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/Profile.php b/classes/Profile.php
index 12ce5d9b6..a32051d07 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -401,10 +401,10 @@ class Profile extends Memcached_DataObject
return $profile;
}
- function getApplications($offset = 0, $limit = null)
+ function getConnectedApps($offset = 0, $limit = null)
{
$qry =
- 'SELECT a.* ' .
+ 'SELECT u.* ' .
'FROM oauth_application_user u, oauth_application a ' .
'WHERE u.profile_id = %d ' .
'AND a.id = u.application_id ' .
@@ -419,11 +419,11 @@ class Profile extends Memcached_DataObject
}
}
- $application = new Oauth_application();
+ $apps = new Oauth_application_user();
- $cnt = $application->query(sprintf($qry, $this->id));
+ $cnt = $apps->query(sprintf($qry, $this->id));
- return $application;
+ return $apps;
}
function subscriptionCount()