aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-26 18:27:03 -0800
committerfriendica <info@friendica.com>2015-01-26 18:27:03 -0800
commitac594183c6fdc6cf4d5a2a29ade7478a17336397 (patch)
treed38f73727da4d8697b00d2102ae10b501d1909ce /include/zot.php
parente6bfe3f2c10e851ed5ba49886ec8d0a9a9de2296 (diff)
parent9f5bfca28dde23893156ad36682e20ca2fc0dd45 (diff)
downloadvolse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.gz
volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.tar.bz2
volse-hubzilla-ac594183c6fdc6cf4d5a2a29ade7478a17336397.zip
Merge branch 'master' into tres and add some work on the item_deleted flag refactor
Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 07d228ea5..18565a214 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -175,7 +175,7 @@ function zot_zot($url,$data) {
*/
-function zot_finger($webbie,$channel,$autofallback = true) {
+function zot_finger($webbie,$channel = null,$autofallback = true) {
if(strpos($webbie,'@') === false) {