Merge commit 'refs/merge-requests/30' of https://gitorious.org/social/mainline into...

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

diff --git a/classes/Profile.php b/classes/Profile.php
index 6f839baaea2363da89f1db2755eac670c51f5db2..0b608fbb24883164733d90560d8c9a8c1c5cbbcc 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -1579,6 +1579,12 @@ class Profile extends Managed_DataObject
         }
     }
 
+    // The same as getPref but will fall back to common_config value for the same namespace/topic
+    public function getConfigPref($namespace, $topic)
+    {
+        return Profile_prefs::getConfigData($this, $namespace, $topic);
+    }
+
     public function setPref($namespace, $topic, $data) {
         return Profile_prefs::setData($this, $namespace, $topic, $data);
     }