Merge branch 'master' into 0.9.x

[quix0rs-gnu-social.git] / classes / Profile.php

diff --git a/classes/Profile.php b/classes/Profile.php
index d030e38b1b5c86866a7f3372a53a7088ea277c7e..eb9299348d4f386401f72177683fb9316dd6d9d2 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -877,6 +877,12 @@ class Profile extends Memcached_DataObject
             case Right::EMAILONFAVE:
                 $result = !$this->isSandboxed();
                 break;
+            case Right::WEBLOGIN:
+                $result = !$this->isSilenced();
+                break;
+            case Right::API:
+                $result = !$this->isSilenced();
+                break;
             case Right::BACKUPACCOUNT:
                 $result = common_config('profile', 'backup');
                 break;
@@ -944,12 +950,12 @@ class Profile extends Memcached_DataObject
      *
      * @param User $cur Current user
      *
-     * @return array representation of <statusnet:profile_info> element
+     * @return array representation of <statusnet:profile_info> element or null
      */
 
     function profileInfo($cur)
     {
-        $profileInfoAttr = array();
+        $profileInfoAttr = array('local_id' => $this->id);
 
         if ($cur != null) {
             // Whether the current user is a subscribed to this profile