Merge remote branch 'upstream/master'

1 files changed, 81 insertions, 81 deletions

diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js
index 244e98fb1..15d1aed09 100644
--- a/doc/html/navtreeindex4.js
+++ b/doc/html/navtreeindex4.js
@@ -1,23 +1,37 @@
 var NAVTREEINDEX4 =
 {
+"dir_0262a6a8df56a167e3761b6e5a54bb1c.html":[6,0,3,1,6],
+"dir_032dd9e2cfe278a2cfa5eb9547448eb9.html":[6,0,3,1,4,0],
+"dir_05f4fba29266e8fd7869afcd6cefb5cb.html":[6,0,3,1,0,2],
+"dir_0eaa4a0adae8ba4811e133c6e594aeee.html":[6,0,2,0],
+"dir_21bc5169ff11430004758be31dcfc6c4.html":[6,0,0,0],
+"dir_23ec12649285f9fabf3a6b7380226c28.html":[6,0,2],
+"dir_25f74a9991dbbca1b52a94e358ca73c1.html":[6,0,2,1,0],
+"dir_3d9c9d0c5e9556dd3eba1e072fa6eaeb.html":[6,0,3,1,4,1],
+"dir_4acb285a1960a920438b718da0958cf4.html":[6,0,3,1,5],
+"dir_55dbaf9b7b53c4fc605c9011743a7353.html":[6,0,3,1,4],
+"dir_65522070e0a83623cefc01ebe26a83e3.html":[6,0,3,1,5,0],
 "dir_6cee3bb9ace89cc4e2f065aa2ca7bc5b.html":[6,0,3,1,1,1,0],
+"dir_6e52a2a2cd27c08b7df5e5cdb216bd77.html":[6,0,3,1,2],
 "dir_720432dea4a717197ae070dbc42b8f20.html":[6,0,2,1],
 "dir_817f6d302394b98e59575acdb59998bc.html":[6,0,3,0],
 "dir_8543001e5d25368a6edede3e63efb554.html":[6,0,3,1],
-"dir_887fdc94312ba7b057b6bfe7fdd27ea5.html":[6,0,3,1,2,0],
-"dir_8e58ba5e98ac07e59ee15ca7486c9950.html":[6,0,3,1,2],
+"dir_887fdc94312ba7b057b6bfe7fdd27ea5.html":[6,0,3,1,3,0],
+"dir_8e58ba5e98ac07e59ee15ca7486c9950.html":[6,0,3,1,3],
 "dir_922c77e958c99a98db92d38a3a349bf2.html":[6,0,3,1,1],
 "dir_92d6b429199666aa3765c8a934db5e14.html":[6,0,3,1,1,1],
-"dir__fns_8php.html":[6,0,0,31],
-"dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16":[6,0,0,31,0],
-"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[6,0,0,31,6],
-"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[6,0,0,31,3],
-"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[6,0,0,31,5],
-"dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e":[6,0,0,31,4],
-"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[6,0,0,31,1],
-"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[6,0,0,31,2],
+"dir_9ef82eb3846cd201470898c3b6ef38cf.html":[6,0,3,1,2,0],
+"dir__fns_8php.html":[6,0,0,32],
+"dir__fns_8php.html#a2f7d74bb2aea8bcd2537aee5c6708a16":[6,0,0,32,0],
+"dir__fns_8php.html#a44062d4b471d1e83f92f6c184585aa13":[6,0,0,32,6],
+"dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d":[6,0,0,32,3],
+"dir__fns_8php.html#aa666e7df6ca8c332f4081c9b66b4bdf6":[6,0,0,32,5],
+"dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e":[6,0,0,32,4],
+"dir__fns_8php.html#acf621621e929d49441da30aad76a58cf":[6,0,0,32,1],
+"dir__fns_8php.html#ae56881d69bb6f8e828c9e35454386774":[6,0,0,32,2],
 "dir_a8a0005c2b8590c535262d232c22afab.html":[6,0,3,1,1,1,0,0],
 "dir_aae29906d7bfc07d076125f669c8352e.html":[6,0,0,1],
+"dir_ac4f5165c8d71ebb1a1a0a168a48f3f7.html":[6,0,3,1,6,0],
 "dir_b2f003339c516cc00c8cadcafbe82f13.html":[6,0,3],
 "dir_c02447ad39a5307c81c64e880ec9e8d3.html":[6,0,3,1,1,0],
 "dir_cb8a8f75dcdd0b3fbfcc82e9eda410c5.html":[6,0,3,1,0,1],
@@ -26,16 +40,16 @@ var NAVTREEINDEX4 =
 "dir_d520c5cf583201d9437764f209363c22.html":[6,0,3,1,0],
 "dir_e7f045be8bb383d8447c6a6b84145083.html":[6,0,0,2],
 "dir_f19da925ee886ec38f19b0e8c19779bc.html":[6,0,3,1,0,0],
-"dirprofile_8php.html":[6,0,1,24],
-"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[6,0,1,24,0],
-"dirsearch_8php.html":[6,0,1,25],
-"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[6,0,1,25,3],
-"dirsearch_8php.html#a52bcac49b0e35cc8c6b70066143c2ee2":[6,0,1,25,1],
-"dirsearch_8php.html#a7d4cd9890d5ed23c3efc58e2a778a305":[6,0,1,25,0],
-"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[6,0,1,25,4],
-"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[6,0,1,25,2],
-"display_8php.html":[6,0,1,26],
-"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[6,0,1,26,0],
+"dirprofile_8php.html":[6,0,1,23],
+"dirprofile_8php.html#a3e1d30d3d93863ff5615f2df4ac7f052":[6,0,1,23,0],
+"dirsearch_8php.html":[6,0,1,24],
+"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[6,0,1,24,3],
+"dirsearch_8php.html#a52bcac49b0e35cc8c6b70066143c2ee2":[6,0,1,24,1],
+"dirsearch_8php.html#a7d4cd9890d5ed23c3efc58e2a778a305":[6,0,1,24,0],
+"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[6,0,1,24,4],
+"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[6,0,1,24,2],
+"display_8php.html":[6,0,1,25],
+"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[6,0,1,25,0],
 "docblox__errorchecker_8php.html":[6,0,2,3],
 "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[6,0,2,3,3],
 "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[6,0,2,3,2],
@@ -48,53 +62,53 @@ var NAVTREEINDEX4 =
 "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[6,0,2,3,4],
 "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[6,0,2,3,1],
 "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[6,0,2,3,10],
-"editblock_8php.html":[6,0,1,27],
-"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[6,0,1,27,0],
-"editlayout_8php.html":[6,0,1,28],
-"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[6,0,1,28,0],
-"editpost_8php.html":[6,0,1,29],
-"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[6,0,1,29,0],
-"editwebpage_8php.html":[6,0,1,30],
-"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[6,0,1,30,0],
-"enotify_8php.html":[6,0,0,33],
-"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[6,0,0,33,1],
-"event_8php.html":[6,0,0,34],
-"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[6,0,0,34,8],
-"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[6,0,0,34,0],
-"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[6,0,0,34,1],
-"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[6,0,0,34,7],
-"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[6,0,0,34,2],
-"event_8php.html#a7378e839ac3de9d55579eb3ec48eaf92":[6,0,0,34,5],
-"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[6,0,0,34,6],
-"event_8php.html#ac9f206819186b65952ac1869f0da8c6e":[6,0,0,34,3],
-"event_8php.html#af5ac41e7ea3f7131088fe6333fd2846c":[6,0,0,34,4],
-"events_8php.html":[6,0,1,31],
-"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[6,0,1,31,0],
-"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[6,0,1,31,1],
-"expire_8php.html":[6,0,0,35],
-"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[6,0,0,35,0],
-"externals_8php.html":[6,0,0,36],
-"externals_8php.html#a4df44079e6f915286088b7a0d44db926":[6,0,0,36,0],
+"editblock_8php.html":[6,0,1,26],
+"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[6,0,1,26,0],
+"editlayout_8php.html":[6,0,1,27],
+"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[6,0,1,27,0],
+"editpost_8php.html":[6,0,1,28],
+"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[6,0,1,28,0],
+"editwebpage_8php.html":[6,0,1,29],
+"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[6,0,1,29,0],
+"enotify_8php.html":[6,0,0,34],
+"enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[6,0,0,34,1],
+"event_8php.html":[6,0,0,35],
+"event_8php.html#a018ea4484910a873a7c1eaa126de9b1a":[6,0,0,35,8],
+"event_8php.html#a180cccd63c2a2f00ff432b03113531f3":[6,0,0,35,0],
+"event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279":[6,0,0,35,1],
+"event_8php.html#a2ac9f1b08de03250ecd794f705781d17":[6,0,0,35,7],
+"event_8php.html#a32ba1b9ddf7a744a9a1512b052e5f850":[6,0,0,35,2],
+"event_8php.html#a7378e839ac3de9d55579eb3ec48eaf92":[6,0,0,35,5],
+"event_8php.html#abb74206cf42d694307c3d7abb7af9869":[6,0,0,35,6],
+"event_8php.html#ac9f206819186b65952ac1869f0da8c6e":[6,0,0,35,3],
+"event_8php.html#af5ac41e7ea3f7131088fe6333fd2846c":[6,0,0,35,4],
+"events_8php.html":[6,0,1,30],
+"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[6,0,1,30,0],
+"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[6,0,1,30,1],
+"expire_8php.html":[6,0,0,36],
+"expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[6,0,0,36,0],
+"externals_8php.html":[6,0,0,37],
+"externals_8php.html#a4df44079e6f915286088b7a0d44db926":[6,0,0,37,0],
 "extract_8php.html":[6,0,2,4],
 "extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44":[6,0,2,4,3],
 "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[6,0,2,4,2],
 "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[6,0,2,4,0],
 "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[6,0,2,4,1],
-"fbrowser_8php.html":[6,0,1,32],
-"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[6,0,1,32,0],
-"features_8php.html":[6,0,0,37],
-"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[6,0,0,37,0],
-"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[6,0,0,37,1],
-"feed_8php.html":[6,0,1,33],
-"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[6,0,1,33,0],
-"filer_8php.html":[6,0,1,34],
-"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[6,0,1,34,0],
-"filerm_8php.html":[6,0,1,35],
-"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[6,0,1,35,0],
+"fbrowser_8php.html":[6,0,1,31],
+"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[6,0,1,31,0],
+"features_8php.html":[6,0,0,38],
+"features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[6,0,0,38,0],
+"features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[6,0,0,38,1],
+"feed_8php.html":[6,0,1,32],
+"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[6,0,1,32,0],
+"filer_8php.html":[6,0,1,33],
+"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[6,0,1,33,0],
+"filerm_8php.html":[6,0,1,34],
+"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[6,0,1,34,0],
 "files.html":[6,0],
-"filestorage_8php.html":[6,0,1,36],
-"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[6,0,1,36,0],
-"filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd":[6,0,1,36,1],
+"filestorage_8php.html":[6,0,1,35],
+"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[6,0,1,35,0],
+"filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd":[6,0,1,35,1],
 "fpostit_8php.html":[6,0,2,0,0],
 "fpostit_8php.html#a3f3ae3ae61578b5671673914fd894443":[6,0,2,0,0,0],
 "fpostit_8php.html#a501b5ca82f287509fc691c88524064c1":[6,0,2,0,0,1],
@@ -114,9 +128,9 @@ var NAVTREEINDEX4 =
 "friendica-to-smarty-tpl_8py.html#ae74419b16516956c66f7db714a93a6ac":[6,0,2,5,7],
 "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[6,0,2,5,4],
 "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[6,0,2,5,3],
-"fsuggest_8php.html":[6,0,1,38],
-"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[6,0,1,38,1],
-"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[6,0,1,38,0],
+"fsuggest_8php.html":[6,0,1,37],
+"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[6,0,1,37,1],
+"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[6,0,1,37,0],
 "full_8php.html":[6,0,3,0,2],
 "full_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,0,2,0],
 "functions.html":[5,3,0],
@@ -165,8 +179,8 @@ var NAVTREEINDEX4 =
 "functions_func_0x75.html":[5,3,1,18],
 "functions_func_0x76.html":[5,3,1,19],
 "functions_vars.html":[5,3,2],
-"globals.html":[6,1,0,0],
 "globals.html":[6,1,0],
+"globals.html":[6,1,0,0],
 "globals_0x5f.html":[6,1,0,1],
 "globals_0x61.html":[6,1,0,2],
 "globals_0x62.html":[6,1,0,3],
@@ -193,8 +207,8 @@ var NAVTREEINDEX4 =
 "globals_0x77.html":[6,1,0,24],
 "globals_0x78.html":[6,1,0,25],
 "globals_0x7a.html":[6,1,0,26],
-"globals_func.html":[6,1,1,0],
 "globals_func.html":[6,1,1],
+"globals_func.html":[6,1,1,0],
 "globals_func_0x61.html":[6,1,1,1],
 "globals_func_0x62.html":[6,1,1,2],
 "globals_func_0x63.html":[6,1,1,3],
@@ -235,19 +249,5 @@ var NAVTREEINDEX4 =
 "globals_vars_0x6c.html":[6,1,2,11],
 "globals_vars_0x6d.html":[6,1,2,12],
 "globals_vars_0x6e.html":[6,1,2,13],
-"globals_vars_0x70.html":[6,1,2,14],
-"globals_vars_0x72.html":[6,1,2,15],
-"globals_vars_0x73.html":[6,1,2,16],
-"globals_vars_0x74.html":[6,1,2,17],
-"globals_vars_0x75.html":[6,1,2,18],
-"globals_vars_0x77.html":[6,1,2,19],
-"globals_vars_0x78.html":[6,1,2,20],
-"globals_vars_0x7a.html":[6,1,2,21],
-"gprobe_8php.html":[6,0,0,39],
-"gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[6,0,0,39,0],
-"greenthumbnails_8php.html":[6,0,3,1,0,2,3],
-"hcard_8php.html":[6,0,1,40],
-"hcard_8php.html#a3663012f1549849af88aba2bb87388e3":[6,0,1,40,0],
-"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[6,0,1,40,1],
-"help_8php.html":[6,0,1,41]
+"globals_vars_0x70.html":[6,1,2,14]
 };