Merge remote-tracking branch 'upstream/master'

1 files changed, 70 insertions, 70 deletions

diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js
index f296d3fe2..41a1f286a 100644
--- a/doc/html/navtreeindex4.js
+++ b/doc/html/navtreeindex4.js
@@ -1,5 +1,38 @@
 var NAVTREEINDEX4 =
 {
+"dba__driver_8php.html":[6,0,0,0,0],
+"dba__driver_8php.html#a2994daa03b1c23229a27e39bcab75e67":[6,0,0,0,0,2],
+"dba__driver_8php.html#a2a38996670c2936b5769270c49c57593":[6,0,0,0,0,11],
+"dba__driver_8php.html#a2c09a731d3b4fef41fed0e83db01be1f":[6,0,0,0,0,17],
+"dba__driver_8php.html#a2c8a72ec73f39b17a167c90737693f78":[6,0,0,0,0,12],
+"dba__driver_8php.html#a30e9a643be804e905f5614a3279d2645":[6,0,0,0,0,5],
+"dba__driver_8php.html#a55bf30d8176967e682656b5be4ad9249":[6,0,0,0,0,16],
+"dba__driver_8php.html#a5df8499634c47b30191f34069d7b98c0":[6,0,0,0,0,6],
+"dba__driver_8php.html#a65b83462bd26968106aebd43f16540e4":[6,0,0,0,0,8],
+"dba__driver_8php.html#a75098bf1d59ea57f7ebae657a369137e":[6,0,0,0,0,3],
+"dba__driver_8php.html#a7c1b98a710ead27382c958ad3216c4ee":[6,0,0,0,0,1],
+"dba__driver_8php.html#aa051799567690a124a3b865bf902f58a":[6,0,0,0,0,10],
+"dba__driver_8php.html#aa377074e70981e8c4e82ca0accd068ee":[6,0,0,0,0,14],
+"dba__driver_8php.html#aa6607893d8f60ade9122bcfbd1a53ffb":[6,0,0,0,0,13],
+"dba__driver_8php.html#ab222aa1dbf9ea93b320f82028739127e":[6,0,0,0,0,7],
+"dba__driver_8php.html#acec84a8fb75d78daf657cbe5df74e25a":[6,0,0,0,0,4],
+"dba__driver_8php.html#af531546fac5f0836a8557a4f6dfee930":[6,0,0,0,0,9],
+"dba__driver_8php.html#afaaa1a7eff9c1b65b3b8c464ae37640e":[6,0,0,0,0,15],
+"dba__mysql_8php.html":[6,0,0,0,1],
+"dba__mysqli_8php.html":[6,0,0,0,2],
+"dba__postgres_8php.html":[6,0,0,0,3],
+"delegate_8php.html":[6,0,1,21],
+"delegate_8php.html#a943eea8996ef348eb845c498f9f354dd":[6,0,1,21,0],
+"deliver_8php.html":[6,0,0,30],
+"deliver_8php.html#a397afcb9afecf0c1816b0951189dd346":[6,0,0,30,0],
+"diaspora_8php.html":[6,0,0,31],
+"diaspora_8php.html#a006731620a5242d410358b32678e48e3":[6,0,0,31,0],
+"diaspora_8php.html#a0b3628a5e53332c3d3196b689fe2b94d":[6,0,0,31,24],
+"diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829":[6,0,0,31,1],
+"diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605":[6,0,0,31,15],
+"diaspora_8php.html#a1704748aa2384c73e43f10e71defd31a":[6,0,0,31,25],
+"diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31":[6,0,0,31,14],
+"diaspora_8php.html#a2bf43f6b5890897f425ef4325d34b007":[6,0,0,31,19],
 "diaspora_8php.html#a33ae0c4606a7df4d801c05507d87f668":[6,0,0,31,26],
 "diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b":[6,0,0,31,12],
 "diaspora_8php.html#a586d5a3ba92d35cee14f879f290072aa":[6,0,0,31,17],
@@ -68,16 +101,14 @@ var NAVTREEINDEX4 =
 "dir_d520c5cf583201d9437764f209363c22.html":[6,0,3,1,0],
 "dir_e7f045be8bb383d8447c6a6b84145083.html":[6,0,0,3],
 "dir_f19da925ee886ec38f19b0e8c19779bc.html":[6,0,3,1,0,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],
+"dirsearch_8php.html":[6,0,1,23],
+"dirsearch_8php.html#a3e51964ae3f5ff147403407b65324752":[6,0,1,23,3],
+"dirsearch_8php.html#a52bcac49b0e35cc8c6b70066143c2ee2":[6,0,1,23,1],
+"dirsearch_8php.html#a7d4cd9890d5ed23c3efc58e2a778a305":[6,0,1,23,0],
+"dirsearch_8php.html#a985d410a170549429857af6ff2673149":[6,0,1,23,4],
+"dirsearch_8php.html#aa1fb04e1de4f25b63349ac78f94ceb4c":[6,0,1,23,2],
+"display_8php.html":[6,0,1,24],
+"display_8php.html#a37137c98d47bf3306f4c2bb9f5b60de0":[6,0,1,24,0],
 "docblox__errorchecker_8php.html":[6,0,2,2],
 "docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62":[6,0,2,2,3],
 "docblox__errorchecker_8php.html#a21b4bbe5aae2d85db33affc7126a67ec":[6,0,2,2,2],
@@ -90,14 +121,17 @@ var NAVTREEINDEX4 =
 "docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6":[6,0,2,2,4],
 "docblox__errorchecker_8php.html#ae9562cf60aa693114603d27b55d2185f":[6,0,2,2,1],
 "docblox__errorchecker_8php.html#af4ca738a05beffe9c8c23e1f7aea3c2d":[6,0,2,2,10],
-"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],
+"editblock_8php.html":[6,0,1,25],
+"editblock_8php.html#ab7806bb42ae5e93f0330d7bd179d4b3e":[6,0,1,25,1],
+"editblock_8php.html#abbe8f55de06967bc8d79d620509a49e6":[6,0,1,25,0],
+"editlayout_8php.html":[6,0,1,26],
+"editlayout_8php.html#a97c1e93d9e75ad8cd2c2f9a7f77341a7":[6,0,1,26,1],
+"editlayout_8php.html#aa877e4157a26b099de904164181dd386":[6,0,1,26,0],
+"editpost_8php.html":[6,0,1,27],
+"editpost_8php.html#a34011690864d122680c802e9e748ccfb":[6,0,1,27,0],
+"editwebpage_8php.html":[6,0,1,28],
+"editwebpage_8php.html#a375e945255fad79a71036528f7480650":[6,0,1,28,0],
+"editwebpage_8php.html#a94109f9c796fbe92508bf9574e35d19f":[6,0,1,28,1],
 "enotify_8php.html":[6,0,0,35],
 "enotify_8php.html#a3e9a9355b243777c488d2a9883908dfc":[6,0,0,35,1],
 "event_8php.html":[6,0,0,36],
@@ -110,9 +144,9 @@ var NAVTREEINDEX4 =
 "event_8php.html#abb74206cf42d694307c3d7abb7af9869":[6,0,0,36,6],
 "event_8php.html#ac9f206819186b65952ac1869f0da8c6e":[6,0,0,36,3],
 "event_8php.html#af5ac41e7ea3f7131088fe6333fd2846c":[6,0,0,36,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],
+"events_8php.html":[6,0,1,29],
+"events_8php.html#a1d293fb217ae6bc9e3858c4b32e363ec":[6,0,1,29,0],
+"events_8php.html#ab3e8a8f901175f8e40a8089eea45c075":[6,0,1,29,1],
 "expire_8php.html":[6,0,0,37],
 "expire_8php.html#a444e45c9b67727b27db4c779fd51a298":[6,0,0,37,0],
 "externals_8php.html":[6,0,0,38],
@@ -122,21 +156,21 @@ var NAVTREEINDEX4 =
 "extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634":[6,0,2,3,2],
 "extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb":[6,0,2,3,0],
 "extract_8php.html#a9590b15215a21e9b42eb546aeef79704":[6,0,2,3,1],
-"fbrowser_8php.html":[6,0,1,31],
-"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[6,0,1,31,0],
+"fbrowser_8php.html":[6,0,1,30],
+"fbrowser_8php.html#aee476addcf7a3e0fe9454f7dfd5a56c4":[6,0,1,30,0],
 "features_8php.html":[6,0,0,39],
 "features_8php.html#a52b5bdfb61b256713efecf7a7b20b0c0":[6,0,0,39,0],
 "features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c":[6,0,0,39,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],
+"feed_8php.html":[6,0,1,31],
+"feed_8php.html#af86137700b56f33d1d5f25c8dec22c04":[6,0,1,31,0],
+"filer_8php.html":[6,0,1,32],
+"filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274":[6,0,1,32,0],
+"filerm_8php.html":[6,0,1,33],
+"filerm_8php.html#ae2eb28d2054fa2c37e38689882172208":[6,0,1,33,0],
 "files.html":[6,0],
-"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],
+"filestorage_8php.html":[6,0,1,34],
+"filestorage_8php.html#a61bb1be78472555df4ce619f51014040":[6,0,1,34,0],
+"filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd":[6,0,1,34,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],
@@ -156,9 +190,9 @@ var NAVTREEINDEX4 =
 "friendica-to-smarty-tpl_8py.html#ae74419b16516956c66f7db714a93a6ac":[6,0,2,4,7],
 "friendica-to-smarty-tpl_8py.html#aecf730e0884bb4ddc6c0deb1ef85f8eb":[6,0,2,4,4],
 "friendica-to-smarty-tpl_8py.html#af6b2c793958aae2aadc294577431f749":[6,0,2,4,3],
-"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],
+"fsuggest_8php.html":[6,0,1,36],
+"fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d":[6,0,1,36,1],
+"fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998":[6,0,1,36,0],
 "full_8php.html":[6,0,3,0,2],
 "full_8php.html#a3987f5547ceb7e36a210a66a06241a5a":[6,0,3,0,2,0],
 "functions.html":[5,3,0],
@@ -215,39 +249,5 @@ var NAVTREEINDEX4 =
 "globals_0x63.html":[6,1,0,4],
 "globals_0x64.html":[6,1,0,5],
 "globals_0x65.html":[6,1,0,6],
-"globals_0x66.html":[6,1,0,7],
-"globals_0x67.html":[6,1,0,8],
-"globals_0x68.html":[6,1,0,9],
-"globals_0x69.html":[6,1,0,10],
-"globals_0x6a.html":[6,1,0,11],
-"globals_0x6b.html":[6,1,0,12],
-"globals_0x6c.html":[6,1,0,13],
-"globals_0x6d.html":[6,1,0,14],
-"globals_0x6e.html":[6,1,0,15],
-"globals_0x6f.html":[6,1,0,16],
-"globals_0x70.html":[6,1,0,17],
-"globals_0x71.html":[6,1,0,18],
-"globals_0x72.html":[6,1,0,19],
-"globals_0x73.html":[6,1,0,20],
-"globals_0x74.html":[6,1,0,21],
-"globals_0x75.html":[6,1,0,22],
-"globals_0x76.html":[6,1,0,23],
-"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],
-"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],
-"globals_func_0x64.html":[6,1,1,4],
-"globals_func_0x65.html":[6,1,1,5],
-"globals_func_0x66.html":[6,1,1,6],
-"globals_func_0x67.html":[6,1,1,7],
-"globals_func_0x68.html":[6,1,1,8],
-"globals_func_0x69.html":[6,1,1,9],
-"globals_func_0x6a.html":[6,1,1,10],
-"globals_func_0x6b.html":[6,1,1,11],
-"globals_func_0x6c.html":[6,1,1,12],
-"globals_func_0x6d.html":[6,1,1,13]
+"globals_0x66.html":[6,1,0,7]
 };