diff options
| author | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
| commit | 912be23e1627211fb417c4b7bced414cbbe38ef0 (patch) | |
| tree | 2b8567d800624167b3eadf37c8855deb0ba74b0b /doc/developer_function_primer.bb | |
| parent | ff68ea608786a698ad46637ef13854ac1b1e6beb (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2 volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip | |
Merge branch 'master' into tres
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
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 3db853b82..373454440 100644 --- a/doc/developer_function_primer.bb +++ b/doc/developer_function_primer.bb @@ -4,11 +4,11 @@ Returns numeric account_id if authenticated or 0. It is possible to be authenticated and not connected to a channel.
-[b]local_user()[/b]
+[b]local_channel()[/b]
Returns authenticated numeric channel_id if authenticated and connected to a channel or 0. Sometimes referred to as $uid in the code.
-[b]remote_user()[/b]
+[b]remote_channel()[/b]
Returns authenticated string hash of Red global identifier, if authenticated via remote auth, or an empty string.
|