diff options
author | zotlabs <mike@macgirvin.com> | 2018-01-12 01:26:01 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2018-01-12 01:26:01 -0800 |
commit | e8958b1fb85ebcc4c51632a2de746b9aec6f354e (patch) | |
tree | b4b74f9fe5f140bc53830a12691d831ffe6cfa3a /boot.php | |
parent | f0798f78333ef52c0859a57c71fd7502923b4242 (diff) | |
parent | 07b67963f128157e85c891057da2c42c286166e7 (diff) | |
download | volse-hubzilla-e8958b1fb85ebcc4c51632a2de746b9aec6f354e.tar.gz volse-hubzilla-e8958b1fb85ebcc4c51632a2de746b9aec6f354e.tar.bz2 volse-hubzilla-e8958b1fb85ebcc4c51632a2de746b9aec6f354e.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'boot.php')
-rwxr-xr-x | boot.php | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -2010,7 +2010,7 @@ function build_querystring($params, $name = null) { } -/* +/** * @brief Much better way of dealing with c-style args. */ function argc() { @@ -2031,6 +2031,8 @@ function dba_timer() { /** * @brief Returns xchan_hash from the observer. * + * Observer can be a local or remote channel. + * * @return string xchan_hash from observer, otherwise empty string if no observer */ function get_observer_hash() { @@ -2041,7 +2043,6 @@ function get_observer_hash() { return ''; } - /** * @brief Returns the complete URL of the current page, e.g.: http(s)://something.com/network * |