Merge remote-tracking branch 'upstream/master'

1 files changed, 79 insertions, 43 deletions

diff --git a/doc/html/navtreeindex9.js b/doc/html/navtreeindex9.js
index 431de1608..fa4f62489 100644
--- a/doc/html/navtreeindex9.js
+++ b/doc/html/navtreeindex9.js
@@ -1,5 +1,40 @@
 var NAVTREEINDEX9 =
 {
+"text_8php.html#ae17b39d5e321debd3ad16dcbbde842b8":[6,0,0,81,40],
+"text_8php.html#ae2126da85966da0e79c6bcbac63b0bda":[6,0,0,81,68],
+"text_8php.html#ae4282a39492caa23ccbc2ce98e54f110":[6,0,0,81,18],
+"text_8php.html#ae4df74296fbe55051ed3c035e55205e5":[6,0,0,81,59],
+"text_8php.html#af8a3e3a66a7b862d4510f145d2e13186":[6,0,0,81,0],
+"text_8php.html#af9c9ac3f74c82dc60acfa404d0e9dc53":[6,0,0,81,79],
+"text_8php.html#afc998d2796a6b2a08e96f7cc061e7221":[6,0,0,81,64],
+"text_8php.html#afdc69fe3f6c09e35e46304dcea63ae28":[6,0,0,81,23],
+"text_8php.html#afe18627c4983ee5f7c940a0992818cd5":[6,0,0,81,12],
+"text_8php.html#afe54312607d92f7ce9593f5760831f80":[6,0,0,81,60],
+"text_8php.html#afe9f178d264d44a94dc1292aaf0fd585":[6,0,0,81,55],
+"theme_2apw_2php_2theme__init_8php.html":[6,0,3,1,0,1,4],
+"theme_2apw_2php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864":[6,0,3,1,0,1,4,0],
+"theme_2blogga_2php_2default_8php.html":[6,0,3,1,1,0,1],
+"theme_2blogga_2php_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3":[6,0,3,1,1,0,1,2],
+"theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a":[6,0,3,1,1,0,1,0],
+"theme_2blogga_2php_2default_8php.html#ac7062908d1eb80c0735270f7997c4527":[6,0,3,1,1,0,1,1],
+"theme_2blogga_2php_2theme__init_8php.html":[6,0,3,1,1,0,3],
+"theme_2blogga_2view_2theme_2blog_2default_8php.html":[6,0,3,1,1,1,0,0,1],
+"theme_2blogga_2view_2theme_2blog_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3":[6,0,3,1,1,1,0,0,1,2],
+"theme_2blogga_2view_2theme_2blog_2default_8php.html#a52d9dd070ed541729088395c22502539":[6,0,3,1,1,1,0,0,1,1],
+"theme_2blogga_2view_2theme_2blog_2default_8php.html#a720581ae288aa09511670563e4205a4a":[6,0,3,1,1,1,0,0,1,0],
+"theme_2mytheme_2php_2default_8php.html":[6,0,3,1,3,0,0],
+"theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,1,3,0,0,0],
+"theme_2redbasic_2php_2theme__init_8php.html":[6,0,3,1,4,0,3],
+"thing_8php.html":[6,0,1,120],
+"thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b":[6,0,1,120,0],
+"thing_8php.html#a8be23b1d475ec3d9291999221c674c80":[6,0,1,120,1],
+"todo.html":[3],
+"toggle__mobile_8php.html":[6,0,1,121],
+"toggle__mobile_8php.html#aca53ade8971802b45c31e722b22c6254":[6,0,1,121,0],
+"toggle__safesearch_8php.html":[6,0,1,122],
+"toggle__safesearch_8php.html#a23d5cfb2727a266e44993ffbf5595a79":[6,0,1,122,0],
+"tpldebug_8php.html":[6,0,2,7],
+"tpldebug_8php.html#a44778457a6c02554812fbfad19d32ba3":[6,0,2,7,0],
 "tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149":[6,0,2,7,1],
 "tpldebug_8php.html#afbc7aadb3f7ff1edf0aaaa326a42179c":[6,0,2,7,2],
 "typo_8php.html":[6,0,2,8],
@@ -11,16 +46,16 @@ var NAVTREEINDEX9 =
 "typohelper_8php.html":[6,0,2,9],
 "typohelper_8php.html#a7542d95618011800c61773127fa625cf":[6,0,2,9,0],
 "typohelper_8php.html#ab6fd357fb5b2a3ba8aab9e8b98c6a805":[6,0,2,9,1],
-"uexport_8php.html":[6,0,1,124],
-"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,124,0],
-"update__channel_8php.html":[6,0,1,125],
-"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,125,0],
-"update__display_8php.html":[6,0,1,126],
-"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,126,0],
-"update__network_8php.html":[6,0,1,127],
-"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,127,0],
-"update__search_8php.html":[6,0,1,128],
-"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,128,0],
+"uexport_8php.html":[6,0,1,123],
+"uexport_8php.html#a118920137dedebe0581623a2e57e7b0d":[6,0,1,123,0],
+"update__channel_8php.html":[6,0,1,124],
+"update__channel_8php.html#aca52a9da500f0db2f0a8666af5bc06ba":[6,0,1,124,0],
+"update__display_8php.html":[6,0,1,125],
+"update__display_8php.html#aa36ac524059e209d5d75a03c16206246":[6,0,1,125,0],
+"update__network_8php.html":[6,0,1,126],
+"update__network_8php.html#a8abf5b9f65af6a27ee2f9d7207ed1b41":[6,0,1,126,0],
+"update__search_8php.html":[6,0,1,127],
+"update__search_8php.html#ace4c3a23fa7d6922399e27c297a6ba52":[6,0,1,127,0],
 "updatetpl_8py.html":[6,0,2,10],
 "updatetpl_8py.html#a52a85ffa6b6d63d840b185a133478c12":[6,0,2,10,5],
 "updatetpl_8py.html#a79c20eb62d568c999b56eb08530355d3":[6,0,2,10,2],
@@ -48,27 +83,28 @@ var NAVTREEINDEX9 =
 "view_2theme_2redbasic_2php_2config_8php.html#a8574a41fa9735ee391ba57ab24b93793":[6,0,3,1,4,0,0,0],
 "view_2theme_2redbasic_2php_2config_8php.html#aa7d5739b72efef9822535b2b32d5364d":[6,0,3,1,4,0,0,1],
 "view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6":[6,0,3,1,4,0,0,2],
-"view_8php.html":[6,0,1,129],
-"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,129,0],
-"viewconnections_8php.html":[6,0,1,130],
-"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,130,1],
-"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,130,0],
-"viewsrc_8php.html":[6,0,1,131],
-"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,131,0],
-"vote_8php.html":[6,0,1,132],
-"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,132,2],
-"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,132,0],
-"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,132,1],
-"wall__attach_8php.html":[6,0,1,133],
-"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,133,0],
-"wall__upload_8php.html":[6,0,1,134],
-"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,134,0],
-"webfinger_8php.html":[6,0,1,135],
-"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,135,0],
-"webpages_8php.html":[6,0,1,136],
-"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,136,0],
-"wfinger_8php.html":[6,0,1,137],
-"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,137,0],
+"view_8php.html":[6,0,1,128],
+"view_8php.html#ac168f6c61a91ba2063f13b441c0ae96e":[6,0,1,128,0],
+"viewconnections_8php.html":[6,0,1,129],
+"viewconnections_8php.html#a00163d50b17568f7b0e48b1ca9ab7330":[6,0,1,129,1],
+"viewconnections_8php.html#ab6c4d983e97b3a8a879567ff76507776":[6,0,1,129,0],
+"viewsrc_8php.html":[6,0,1,130],
+"viewsrc_8php.html#a6eff3d0c1d7d14b335c4edb785cd60a4":[6,0,1,130,0],
+"vote_8php.html":[6,0,1,131],
+"vote_8php.html#a57a9516ee1b923b224e66dcc47377fb2":[6,0,1,131,2],
+"vote_8php.html#a6aa67489bf458ca5e3206e46dac68596":[6,0,1,131,0],
+"vote_8php.html#ae0c6610f40afbbc1f4fe6494c51fbab2":[6,0,1,131,1],
+"wall__attach_8php.html":[6,0,1,132],
+"wall__attach_8php.html#a7385e970e93228d082f0fd7254f6e653":[6,0,1,132,0],
+"wall__upload_8php.html":[6,0,1,133],
+"wall__upload_8php.html#a7cbe204244cf9e0380ee932263a74d8f":[6,0,1,133,0],
+"webfinger_8php.html":[6,0,1,134],
+"webfinger_8php.html#a17dd28db6d390194bf9ecb809739d1d3":[6,0,1,134,0],
+"webpages_8php.html":[6,0,1,135],
+"webpages_8php.html#af3b7397d4abc153e3d2147740ee1a41d":[6,0,1,135,0],
+"webpages_8php.html#af9ad0b65eba79acead3fa32b43d888b7":[6,0,1,135,1],
+"wfinger_8php.html":[6,0,1,136],
+"wfinger_8php.html#ae21e50c8d0a5f3c9be9f43a4e519acd3":[6,0,1,136,0],
 "widedarkness_8php.html":[6,0,3,1,0,2,10],
 "widgets_8php.html":[6,0,0,82],
 "widgets_8php.html#a08035db02ff6a23260146b4c64153422":[6,0,0,82,12],
@@ -102,14 +138,14 @@ var NAVTREEINDEX9 =
 "widgets_8php.html#af37fdad3b2e861d860a4a8c4d8a76c0b":[6,0,0,82,5],
 "widgets_8php.html#af919de8e7e2ba8192a65fadc72a2c8b5":[6,0,0,82,4],
 "widgets_8php.html#afa2e55a78f95667a6da082efac7fec74":[6,0,0,82,18],
-"xchan_8php.html":[6,0,1,138],
-"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,138,0],
-"xrd_8php.html":[6,0,1,139],
-"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,139,0],
-"xref_8php.html":[6,0,1,140],
-"xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,140,0],
-"zfinger_8php.html":[6,0,1,141],
-"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,141,0],
+"xchan_8php.html":[6,0,1,137],
+"xchan_8php.html#a9853348bf1a35c644460221ba75edc2d":[6,0,1,137,0],
+"xrd_8php.html":[6,0,1,138],
+"xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270":[6,0,1,138,0],
+"xref_8php.html":[6,0,1,139],
+"xref_8php.html#a9bee399213b8de8226b0d60834307473":[6,0,1,139,0],
+"zfinger_8php.html":[6,0,1,140],
+"zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0":[6,0,1,140,0],
 "zot_8php.html":[6,0,0,83],
 "zot_8php.html#a083aec6c900d244e1bfc1406f9461465":[6,0,0,83,15],
 "zot_8php.html#a084c581d534e7e3b759488b46602288f":[6,0,0,83,20],
@@ -144,8 +180,8 @@ var NAVTREEINDEX9 =
 "zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca":[6,0,0,83,21],
 "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7":[6,0,0,83,24],
 "zot_8php.html#aeea071f17e306fe3d0c488551906bfab":[6,0,0,83,26],
-"zotfeed_8php.html":[6,0,1,142],
-"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,142,0],
-"zping_8php.html":[6,0,1,143],
-"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[6,0,1,143,0]
+"zotfeed_8php.html":[6,0,1,141],
+"zotfeed_8php.html#a24dfc23d366e7f840cf2847d0c1c8eac":[6,0,1,141,0],
+"zping_8php.html":[6,0,1,142],
+"zping_8php.html#a4d3a6b0b8b04ed6469015823e615ee75":[6,0,1,142,0]
 };