diff options
author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
---|---|---|
committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /doc/developer_function_primer.bb | |
parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip |
Fix merge conflict
Diffstat (limited to 'doc/developer_function_primer.bb')
-rw-r--r-- | doc/developer_function_primer.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb index 3d5fe82a9..3db853b82 100644 --- a/doc/developer_function_primer.bb +++ b/doc/developer_function_primer.bb @@ -20,13 +20,13 @@ Returns the global app structure ($a). (App:: is usually assigned to the global $a), so $a->get_observer() or get_app()->get_observer() - returns an xchan structure representing the current viewer if authenticated (locally or remotely).
-[b]get_config($family,$key), get_pconfig($uid,$family,$key)[/b]
+[b]get_config($family,$key), get_pconfig($uid,$family,$key), get_xconfig($xchan_hash,$family,$key)[/b]
Returns the config setting for $family and $key or false if unset.
[b] set_config($family,$key,$value), set_pconfig($uid,$family,$key,$value)[/b]
-Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id).
+Sets the value of config setting for $family and $key to $value. Returns $value. The config versions operate on system-wide settings. The pconfig versions get/set the values for a specific integer uid (channel_id). The xconfig version get/sets the value for a specific xchan hash - generally used for remote users.
[b]dbesc()[/b]
|