diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-05-21 21:23:40 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-05-21 21:23:40 -0400 |
| commit | 867e3b33d11a8403ce2d7eda567b8eb7ba58bda7 (patch) | |
| tree | 1a91309205c5659516b0a7daab0d478db82b846a /include | |
| parent | f570965ebe65fe7d549cafea5f5d8c04da3d986f (diff) | |
| parent | 9ca3ac6e61ff57a2bc615b133a64b0a7f66b3c41 (diff) | |
| download | volse-hubzilla-867e3b33d11a8403ce2d7eda567b8eb7ba58bda7.tar.gz volse-hubzilla-867e3b33d11a8403ce2d7eda567b8eb7ba58bda7.tar.bz2 volse-hubzilla-867e3b33d11a8403ce2d7eda567b8eb7ba58bda7.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
rev update, bug 428, 429, and ability to block globaldir submissions from demo sites
* master:
Diffstat (limited to 'include')
| -rw-r--r-- | include/directory.php | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/directory.php b/include/directory.php index cae78adb4..45386183c 100644 --- a/include/directory.php +++ b/include/directory.php @@ -24,6 +24,9 @@ function directory_run($argv, $argc){ load_config('system'); + load_hooks(); + + $a->set_baseurl(get_config('system','url')); $dir = get_config('system','directory_submit_url'); @@ -31,7 +34,12 @@ function directory_run($argv, $argc){ if(! strlen($dir)) return; - fetch_url($dir . '?url=' . bin2hex($argv[1])); + $arr = array('url' => $argv[1]); + + call_hooks('globaldir_update', $arr); + + if(strlen($arr['url'])) + fetch_url($dir . '?url=' . bin2hex($arr['url'])); return; } |