diff options
author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
---|---|---|
committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /doc/hook | |
parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'doc/hook')
-rw-r--r-- | doc/hook/discover_by_webbie.bb | 1 | ||||
-rw-r--r-- | doc/hook/discover_channel_webfinger.bb | 14 | ||||
-rw-r--r-- | doc/hook/module_mod_aftercontent.bb | 2 | ||||
-rw-r--r-- | doc/hook/module_mod_content.bb | 2 |
4 files changed, 16 insertions, 3 deletions
diff --git a/doc/hook/discover_by_webbie.bb b/doc/hook/discover_by_webbie.bb deleted file mode 100644 index f9228932e..000000000 --- a/doc/hook/discover_by_webbie.bb +++ /dev/null @@ -1 +0,0 @@ -[h2]discover_by_webbie[/h2] diff --git a/doc/hook/discover_channel_webfinger.bb b/doc/hook/discover_channel_webfinger.bb new file mode 100644 index 000000000..b0eb5f2c4 --- /dev/null +++ b/doc/hook/discover_channel_webfinger.bb @@ -0,0 +1,14 @@ +[h2]discover_channel_webfinger[/h2] + +Called after performing channel discovery using RFC7033 webfinger and where the channel is not recognised as zot. + +Passed an array: + + address: URL or address that is being discovered + success: set to true if the plugin discovers something + webfinger: array of webfinger links (output of webfinger_rfc7033()) + + + if your plugin indicates success you are expected to generate and populate an xchan (and hubloc) record prior to returning. + +
\ No newline at end of file diff --git a/doc/hook/module_mod_aftercontent.bb b/doc/hook/module_mod_aftercontent.bb index 5d48435b8..04e3c8d88 100644 --- a/doc/hook/module_mod_aftercontent.bb +++ b/doc/hook/module_mod_aftercontent.bb @@ -8,5 +8,5 @@ The hook data for this call consists of an array This element contains the HTML content which was prepared for this page by calling the module_content() function. It is invoked after the content has been created. It does not contain the result of AJAX or asynchronous page load calls. - The current module may be determined by lookin at $a->module + The current module may be determined by lookin at App::$module diff --git a/doc/hook/module_mod_content.bb b/doc/hook/module_mod_content.bb index 39f5743b1..eef5b7ba5 100644 --- a/doc/hook/module_mod_content.bb +++ b/doc/hook/module_mod_content.bb @@ -6,5 +6,5 @@ The hook data for this call consists of an array This element contains the HTML content before calling the module_content() function. It is invoked before the content region has been populated. This may or may not be empty as there may be other processes or addons generating content prior to your hook handler is run. Be certain to preserve any current content. Typically anything you add here will be placed at the top of the content region of the page, but in any event prior to the main content region being generated. - The current module may be determined by lookin at $a->module + The current module may be determined by lookin at App::$module |