Merge remote-tracking branch 'upstream/master'

29 files changed, 101 insertions, 64 deletions

diff --git a/doc/html/search/all_61.js b/doc/html/search/all_61.js
index dfe3e75dd..6c4bd6b16 100644
--- a/doc/html/search/all_61.js
+++ b/doc/html/search/all_61.js
@@ -46,6 +46,7 @@ var searchData=
   ['activity_5fobj_5fphoto',['ACTIVITY_OBJ_PHOTO',['../boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966',1,'boot.php']]],
   ['activity_5fobj_5fprofile',['ACTIVITY_OBJ_PROFILE',['../boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5',1,'boot.php']]],
   ['activity_5fobj_5ftagterm',['ACTIVITY_OBJ_TAGTERM',['../boot_8php.html#a1da180f961f49a11573cac4ff6c62c05',1,'boot.php']]],
+  ['activity_5fobj_5fthing',['ACTIVITY_OBJ_THING',['../boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8',1,'boot.php']]],
   ['activity_5fpoke',['ACTIVITY_POKE',['../boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd',1,'boot.php']]],
   ['activity_5fpost',['ACTIVITY_POST',['../boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4',1,'boot.php']]],
   ['activity_5freq_5ffriend',['ACTIVITY_REQ_FRIEND',['../boot_8php.html#afe084c30a1810c10442edb4fbcbc0086',1,'boot.php']]],
diff --git a/doc/html/search/all_62.js b/doc/html/search/all_62.js
index 49da6d91a..01317772b 100644
--- a/doc/html/search/all_62.js
+++ b/doc/html/search/all_62.js
@@ -16,9 +16,10 @@ var searchData=
   ['bbcode_2ephp',['bbcode.php',['../bbcode_8php.html',1,'']]],
   ['bbtoevent',['bbtoevent',['../event_8php.html#a180cccd63c2a2f00ff432b03113531f3',1,'event.php']]],
   ['bbtovcal',['bbtovcal',['../event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279',1,'event.php']]],
-  ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#a32e7750ae6adbfdd1f227f6e89221ce3',1,'conversation.php']]],
+  ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.php']]],
   ['boot_2ephp',['boot.php',['../boot_8php.html',1,'']]],
   ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]],
   ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]],
-  ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]]
+  ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]],
+  ['build_5fsync_5fpacket',['build_sync_packet',['../include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7',1,'settings.php']]]
 ];
diff --git a/doc/html/search/all_63.js b/doc/html/search/all_63.js
index c20ca9b39..8809b5b7d 100644
--- a/doc/html/search/all_63.js
+++ b/doc/html/search/all_63.js
@@ -4,6 +4,7 @@ var searchData=
   ['cache_2ephp',['cache.php',['../cache_8php.html',1,'']]],
   ['cal',['cal',['../datetime_8php.html#aea356409ba69f9de412298c998595dd2',1,'datetime.php']]],
   ['call_5fhooks',['call_hooks',['../plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c',1,'plugin.php']]],
+  ['can_5fcomment_5fon_5fpost',['can_comment_on_post',['../items_8php.html#a1e75047cf175aaee8dd16aa761913ff9',1,'items.php']]],
   ['categories_5fwidget',['categories_widget',['../contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353',1,'contact_widgets.php']]],
   ['change_5fchannel',['change_channel',['../security_8php.html#a8d23d2597aae380a3341872fe9513380',1,'security.php']]],
   ['change_5fpermissions',['change_permissions',['../classProtoDriver.html#a34b97ca5ef2165f2e16eb2fe59ff6c67',1,'ProtoDriver\change_permissions()'],['../classZotDriver.html#a6776935156accb0f170e2e24577133db',1,'ZotDriver\change_permissions()']]],
@@ -71,6 +72,7 @@ var searchData=
   ['connect',['connect',['../classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc',1,'dba_driver\connect()'],['../classdba__mysql.html#a1887338627ce0e28786839363014bd0b',1,'dba_mysql\connect()'],['../classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1',1,'dba_mysqli\connect()']]],
   ['connections_2ephp',['connections.php',['../connections_8php.html',1,'']]],
   ['connections_5faside',['connections_aside',['../connections_8php.html#af48f7ad20914760ba9874c090384e35a',1,'connections.php']]],
+  ['connections_5fclone',['connections_clone',['../connections_8php.html#a15af118efee9c948b6f8294e54a73bb2',1,'connections.php']]],
   ['connections_5fcontent',['connections_content',['../connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c',1,'connections.php']]],
   ['connections_5finit',['connections_init',['../connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558',1,'connections.php']]],
   ['connections_5fpost',['connections_post',['../connections_8php.html#a1224058db8e3fb56463eb312f98e561d',1,'connections.php']]],
@@ -95,7 +97,7 @@ var searchData=
   ['contactgroup_5fcontent',['contactgroup_content',['../contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3',1,'contactgroup.php']]],
   ['contacts_5fnot_5fgrouped',['contacts_not_grouped',['../Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc',1,'Contact.php']]],
   ['conv_5fsort',['conv_sort',['../conversation_8php.html#abed85a41f1160598de880b84021c9cf7',1,'conversation.php']]],
-  ['conversation',['Conversation',['../classConversation.html',1,'']]],
+  ['conversation',['Conversation',['../classConversation.html',1,'Conversation'],['../conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1',1,'conversation(&$a, $items, $mode, $update, $page_mode= 'traditional'): conversation.php']]],
   ['conversation_2ephp',['conversation.php',['../conversation_8php.html',1,'']]],
   ['conversationobject_2ephp',['ConversationObject.php',['../ConversationObject_8php.html',1,'']]],
   ['convert',['convert',['../namespacefriendica-to-smarty-tpl.html#a38503e37fe68ac27c88cce91a9ac9efa',1,'friendica-to-smarty-tpl']]],
diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js
index 712a915e0..f1cd4b7f2 100644
--- a/doc/html/search/all_66.js
+++ b/doc/html/search/all_66.js
@@ -14,14 +14,9 @@ var searchData=
   ['fetch_5furl',['fetch_url',['../include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a',1,'network.php']]],
   ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]],
   ['field_5ftimezone',['field_timezone',['../datetime_8php.html#a03900dcf0f9e3c58793a031673a70326',1,'datetime.php']]],
-  ['file_5ftag_5fdecode',['file_tag_decode',['../text_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'text.php']]],
-  ['file_5ftag_5fencode',['file_tag_encode',['../text_8php.html#a3299482ac20e9d79453048dd52881d37',1,'text.php']]],
-  ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../text_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'text.php']]],
-  ['file_5ftag_5ffile_5fto_5flist',['file_tag_file_to_list',['../text_8php.html#a544fc13c1798371e5a5984b5482108f8',1,'text.php']]],
-  ['file_5ftag_5flist_5fto_5ffile',['file_tag_list_to_file',['../text_8php.html#abb55ec0142207aeec3d90b25ed4d7266',1,'text.php']]],
-  ['file_5ftag_5fsave_5ffile',['file_tag_save_file',['../text_8php.html#a30311fd46e05be0e2cc466118641a4ed',1,'text.php']]],
-  ['file_5ftag_5funsave_5ffile',['file_tag_unsave_file',['../text_8php.html#a48f6d04513d26270e10e9b7d153f7526',1,'text.php']]],
-  ['file_5ftag_5fupdate_5fpconfig',['file_tag_update_pconfig',['../text_8php.html#abbe4894b4e746e47e1f91c7df27f6e81',1,'text.php']]],
+  ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]],
+  ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]],
+  ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'taxonomy.php']]],
   ['fileas_5fwidget',['fileas_widget',['../contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b',1,'contact_widgets.php']]],
   ['filename',['filename',['../namespacefriendica-to-smarty-tpl.html#a5f9bf7a67d955c0d6be70a82097611c5',1,'friendica-to-smarty-tpl']]],
   ['filer_2ephp',['filer.php',['../filer_8php.html',1,'']]],
@@ -46,8 +41,8 @@ var searchData=
   ['fkoauthdatastore',['FKOAuthDataStore',['../classFKOAuthDataStore.html',1,'']]],
   ['flip',['flip',['../classphoto__driver.html#a2b2a99021fc63ed6465d703ddddcb832',1,'photo_driver\flip()'],['../classphoto__gd.html#a44cedef376044018702d9355ddc813ce',1,'photo_gd\flip()'],['../classphoto__imagick.html#aff6bcdbab18593a3fc5a480db8509393',1,'photo_imagick\flip()']]],
   ['fnull',['fnull',['../namespaceupdatetpl.html#a79c20eb62d568c999b56eb08530355d3',1,'updatetpl']]],
-  ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
   ['follow_2ephp',['follow.php',['../mod_2follow_8php.html',1,'']]],
+  ['follow_2ephp',['follow.php',['../include_2follow_8php.html',1,'']]],
   ['follow_5fcontent',['follow_content',['../mod_2follow_8php.html#a4c540ea4e9f5c581c1a53516ac585592',1,'follow.php']]],
   ['follow_5finit',['follow_init',['../mod_2follow_8php.html#a171f5b19f50d7738adc3b2e96ec6018a',1,'follow.php']]],
   ['follow_5fwidget',['follow_widget',['../contact__widgets_8php.html#af24e693532a045954caab515942cfc6f',1,'contact_widgets.php']]],
@@ -57,9 +52,10 @@ var searchData=
   ['format_5fevent_5fdiaspora',['format_event_diaspora',['../bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863',1,'bb2diaspora.php']]],
   ['format_5fevent_5fhtml',['format_event_html',['../event_8php.html#a2ac9f1b08de03250ecd794f705781d17',1,'event.php']]],
   ['format_5fjs_5fif_5fexists',['format_js_if_exists',['../plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f',1,'plugin.php']]],
+  ['format_5flike',['format_like',['../conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3',1,'conversation.php']]],
   ['format_5flocation',['format_location',['../conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3',1,'conversation.php']]],
   ['format_5fnotification',['format_notification',['../include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3',1,'notify.php']]],
-  ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'text.php']]],
+  ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'taxonomy.php']]],
   ['fpostit_2ephp',['fpostit.php',['../fpostit_8php.html',1,'']]],
   ['fresh_2emd',['fresh.md',['../fresh_8md.html',1,'']]],
   ['friendica',['Friendica',['../namespaceFriendica.html',1,'']]],
diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js
index 4f0861f92..2a5f15c19 100644
--- a/doc/html/search/all_67.js
+++ b/doc/html/search/all_67.js
@@ -21,7 +21,8 @@ var searchData=
   ['get_5fchildren',['get_children',['../classItem.html#aa0ee775ec94abccec6c798428835d001',1,'Item']]],
   ['get_5fcomment_5fbox',['get_comment_box',['../classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf',1,'Item']]],
   ['get_5fcomment_5fbox_5ftemplate',['get_comment_box_template',['../classItem.html#a904421c7a427411bb2ab473bca872f63',1,'Item']]],
-  ['get_5fconfig',['get_config',['../include_2config_8php.html#a5d19130818ea4c6b8726ab62cd989c15',1,'config.php']]],
+  ['get_5fconfig',['get_config',['../include_2config_8php.html#af02c96e6b37335774b548914ede1d22e',1,'config.php']]],
+  ['get_5fconfig_5ffrom_5fstorage',['get_config_from_storage',['../include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74',1,'config.php']]],
   ['get_5fconversation',['get_conversation',['../classItem.html#a0c301aaed2b7d682728d18db3a22afa3',1,'Item']]],
   ['get_5fcurl_5fcode',['get_curl_code',['../classApp.html#ab410451f132910773d0a02e35d0dced9',1,'App']]],
   ['get_5fcurl_5fheaders',['get_curl_headers',['../classApp.html#abaf2173711e861ae4aebf43a7f70157e',1,'App']]],
@@ -73,13 +74,13 @@ var searchData=
   ['get_5ftemplate_5fengine',['get_template_engine',['../classApp.html#acb27e607fe4c82603444676e25c36b70',1,'App']]],
   ['get_5ftemplate_5fldelim',['get_template_ldelim',['../classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a',1,'App']]],
   ['get_5ftemplate_5frdelim',['get_template_rdelim',['../classApp.html#aab23c59172310fd30f2d60dc039d3eea',1,'App']]],
-  ['get_5fterms_5foftype',['get_terms_oftype',['../text_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'text.php']]],
-  ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
+  ['get_5fterms_5foftype',['get_terms_oftype',['../taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'taxonomy.php']]],
+  ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../mod_2settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
   ['get_5ftheme_5finfo',['get_theme_info',['../plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405',1,'plugin.php']]],
   ['get_5ftheme_5fscreenshot',['get_theme_screenshot',['../plugin_8php.html#a48047edfbef770125a5508dcc2f9282f',1,'plugin.php']]],
   ['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]],
   ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]],
-  ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#ae4269ab151d08b5dcb1581b2920a934b',1,'config.php']]],
+  ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]],
   ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]],
   ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]],
   ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]],
@@ -91,8 +92,8 @@ var searchData=
   ['gravity_5fcomment',['GRAVITY_COMMENT',['../boot_8php.html#a4a12ce5de39789b0361e308d89925a20',1,'boot.php']]],
   ['gravity_5flike',['GRAVITY_LIKE',['../boot_8php.html#a1f5906598e90b5ea2b4245f682be4348',1,'boot.php']]],
   ['gravity_5fparent',['GRAVITY_PARENT',['../boot_8php.html#a2af173e4e9836ee7c90757b4793a2be3',1,'boot.php']]],
-  ['group_2ephp',['group.php',['../mod_2group_8php.html',1,'']]],
   ['group_2ephp',['group.php',['../include_2group_8php.html',1,'']]],
+  ['group_2ephp',['group.php',['../mod_2group_8php.html',1,'']]],
   ['group_5fadd',['group_add',['../include_2group_8php.html#a0a515d42ec78aa0066aac4c278ead5b0',1,'group.php']]],
   ['group_5fadd_5fmember',['group_add_member',['../include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b',1,'group.php']]],
   ['group_5faside',['group_aside',['../mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c',1,'group.php']]],
diff --git a/doc/html/search/all_69.js b/doc/html/search/all_69.js
index 635e8be89..d63d5a05a 100644
--- a/doc/html/search/all_69.js
+++ b/doc/html/search/all_69.js
@@ -44,18 +44,22 @@ var searchData=
   ['item_5fdelayed_5fpublish',['ITEM_DELAYED_PUBLISH',['../boot_8php.html#ac890557fedc5b5a3b1d996249b1e1a20',1,'boot.php']]],
   ['item_5fdeleted',['ITEM_DELETED',['../boot_8php.html#a3515ea6bf77495de89b93e9ccd881c49',1,'boot.php']]],
   ['item_5fexpire',['item_expire',['../items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc',1,'items.php']]],
+  ['item_5fextract_5fimages',['item_extract_images',['../conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654',1,'conversation.php']]],
   ['item_5fgetfeedattach',['item_getfeedattach',['../items_8php.html#a09d425596b9f8663472cf7474ad36d96',1,'items.php']]],
   ['item_5fgetfeedtags',['item_getfeedtags',['../items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7',1,'items.php']]],
   ['item_5fhidden',['ITEM_HIDDEN',['../boot_8php.html#ac99fc4d040764eac1736bec6973556fe',1,'boot.php']]],
   ['item_5fmentionsme',['ITEM_MENTIONSME',['../boot_8php.html#a8da836617174eed9fc2ac8054125354b',1,'boot.php']]],
   ['item_5fmessage_5fid',['item_message_id',['../text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e',1,'text.php']]],
   ['item_5fmoderated',['ITEM_MODERATED',['../boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450',1,'boot.php']]],
+  ['item_5fnocomment',['ITEM_NOCOMMENT',['../boot_8php.html#a949116d9a295b214293006c060ca4848',1,'boot.php']]],
   ['item_5fnotshown',['ITEM_NOTSHOWN',['../boot_8php.html#a8663f32171568489dbb2a01dd00371f8',1,'boot.php']]],
   ['item_5fnsfw',['ITEM_NSFW',['../boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08',1,'boot.php']]],
   ['item_5forigin',['ITEM_ORIGIN',['../boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7',1,'boot.php']]],
   ['item_5fpermissions_5fsql',['item_permissions_sql',['../security_8php.html#a9355488460ab11d6058656ff919e5cf9',1,'security.php']]],
+  ['item_5fphoto_5fmenu',['item_photo_menu',['../conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3',1,'conversation.php']]],
   ['item_5fpost',['item_post',['../item_8php.html#a693cd09805755ab85bbb5ecae69a48c3',1,'item.php']]],
   ['item_5fpost_5ftype',['item_post_type',['../text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e',1,'text.php']]],
+  ['item_5fredir_5fand_5freplace_5fimages',['item_redir_and_replace_images',['../conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533',1,'conversation.php']]],
   ['item_5frelay',['ITEM_RELAY',['../boot_8php.html#a2958a2bd5422b85329d7c36c06dbc221',1,'boot.php']]],
   ['item_5fspam',['ITEM_SPAM',['../boot_8php.html#a40d885b2cfd736aab4234ae641ca4dfb',1,'boot.php']]],
   ['item_5fstarred',['ITEM_STARRED',['../boot_8php.html#a7af107fab8d62b9a73801713b774ed30',1,'boot.php']]],
diff --git a/doc/html/search/all_6c.js b/doc/html/search/all_6c.js
index 258e43f4e..4e54ba411 100644
--- a/doc/html/search/all_6c.js
+++ b/doc/html/search/all_6c.js
@@ -8,6 +8,7 @@ var searchData=
   ['legal_5fwebbie',['legal_webbie',['../text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728',1,'text.php']]],
   ['like_2ephp',['like.php',['../like_8php.html',1,'']]],
   ['like_5fcontent',['like_content',['../like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538',1,'like.php']]],
+  ['like_5fpuller',['like_puller',['../conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0',1,'conversation.php']]],
   ['limit_5fbody_5fsize',['limit_body_size',['../items_8php.html#af94c281016c6c912d06e064113336c5c',1,'items.php']]],
   ['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]],
   ['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]],
@@ -17,13 +18,13 @@ var searchData=
   ['load_5fdatabase',['load_database',['../setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a',1,'setup.php']]],
   ['load_5fdatabase_5frem',['load_database_rem',['../setup_8php.html#a2b375ddc555140236fc500135de99371',1,'setup.php']]],
   ['load_5fhooks',['load_hooks',['../plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813',1,'plugin.php']]],
-  ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#ab012f852866a0aff9b5180daffa454f5',1,'config.php']]],
+  ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6',1,'config.php']]],
   ['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]],
   ['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]],
-  ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a913d4e1a6ee7acc1598c69b902c06fd2',1,'config.php']]],
+  ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33',1,'config.php']]],
   ['local_5fdelivery',['local_delivery',['../items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45',1,'items.php']]],
   ['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
-  ['localize_5fitem',['localize_item',['../conversation_8php.html#afea815dd1768e8417d2b30be53e9e0b4',1,'conversation.php']]],
+  ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]],
   ['lockview_2ephp',['lockview.php',['../lockview_8php.html',1,'']]],
   ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]],
   ['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]],
diff --git a/doc/html/search/all_70.js b/doc/html/search/all_70.js
index 8b90ca80f..2d5ae73fa 100644
--- a/doc/html/search/all_70.js
+++ b/doc/html/search/all_70.js
@@ -66,7 +66,9 @@ var searchData=
   ['photos_5finit',['photos_init',['../mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014',1,'photos.php']]],
   ['photos_5flist_5fphotos',['photos_list_photos',['../include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51',1,'photos.php']]],
   ['photos_5fpost',['photos_post',['../mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080',1,'photos.php']]],
+  ['php_2ephp',['php.php',['../php_8php.html',1,'']]],
   ['php2po_2ephp',['php2po.php',['../php2po_8php.html',1,'']]],
+  ['php_5finit',['php_init',['../php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6',1,'php.php']]],
   ['php_5ftpl',['php_tpl',['../namespacefriendica-to-smarty-tpl.html#a5dfc21ab8282dda8e3a7dff43cd0e283',1,'friendica-to-smarty-tpl']]],
   ['ping_2ephp',['ping.php',['../ping_8php.html',1,'']]],
   ['ping_5finit',['ping_init',['../ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1',1,'ping.php']]],
diff --git a/doc/html/search/all_73.js b/doc/html/search/all_73.js
index 0f04a98ed..58f244ebe 100644
--- a/doc/html/search/all_73.js
+++ b/doc/html/search/all_73.js
@@ -52,9 +52,10 @@ var searchData=
   ['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]],
   ['set_5fxconfig',['set_xconfig',['../include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e',1,'config.php']]],
   ['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]],
-  ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]],
-  ['settings_5faside',['settings_aside',['../settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
-  ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
+  ['settings_2ephp',['settings.php',['../include_2settings_8php.html',1,'']]],
+  ['settings_2ephp',['settings.php',['../mod_2settings_8php.html',1,'']]],
+  ['settings_5faside',['settings_aside',['../mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
+  ['settings_5fpost',['settings_post',['../mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
   ['setup_2ephp',['setup.php',['../setup_8php.html',1,'']]],
   ['setup_5fcontent',['setup_content',['../setup_8php.html#a88247384a96e14516f474d7af6a465c1',1,'setup.php']]],
   ['setup_5finit',['setup_init',['../setup_8php.html#a267555abd17290e659b4bf44b885e4e0',1,'setup.php']]],
@@ -83,15 +84,15 @@ var searchData=
   ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]],
   ['starred_5finit',['starred_init',['../starred_8php.html#a63024fb418c678e49fd535e3752d349a',1,'starred.php']]],
   ['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]],
-  ['status_5feditor',['status_editor',['../conversation_8php.html#aedf008b9eac87f693d7dcc1a01404d85',1,'conversation.php']]],
+  ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]],
   ['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]],
-  ['store_5fitem_5ftag',['store_item_tag',['../text_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'text.php']]],
+  ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]],
   ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809',1,'security.php']]],
   ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
   ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]],
   ['stripdcode_5fbr_5fcb',['stripdcode_br_cb',['../bb2diaspora_8php.html#a180b0e3a7d702998be19e3c3b44b0e93',1,'bb2diaspora.php']]],
-  ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
   ['style_2ephp',['style.php',['../redstrap_2php_2style_8php.html',1,'']]],
+  ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
   ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]],
   ['subthread_5fcontent',['subthread_content',['../subthread_8php.html#a50368f3d825b77996030528e7fbfa3d3',1,'subthread.php']]],
   ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]],
diff --git a/doc/html/search/all_74.js b/doc/html/search/all_74.js
index f57bf33ee..90fb7f934 100644
--- a/doc/html/search/all_74.js
+++ b/doc/html/search/all_74.js
@@ -2,14 +2,15 @@ var searchData=
 [
   ['t',['t',['../language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04',1,'language.php']]],
   ['tag_5fdeliver',['tag_deliver',['../items_8php.html#ab1bce4261bcf75ad62753b498a144d17',1,'items.php']]],
-  ['tagadelic',['tagadelic',['../text_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'text.php']]],
-  ['tagblock',['tagblock',['../text_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'text.php']]],
+  ['tagadelic',['tagadelic',['../taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'taxonomy.php']]],
+  ['tagblock',['tagblock',['../taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'taxonomy.php']]],
   ['tagger_2ephp',['tagger.php',['../tagger_8php.html',1,'']]],
   ['tagger_5fcontent',['tagger_content',['../tagger_8php.html#a0e4a3eb177d1684553c547503d67161c',1,'tagger.php']]],
   ['tagrm_2ephp',['tagrm.php',['../tagrm_8php.html',1,'']]],
   ['tagrm_5fcontent',['tagrm_content',['../tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a',1,'tagrm.php']]],
   ['tagrm_5fpost',['tagrm_post',['../tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78',1,'tagrm.php']]],
-  ['tags_5fsort',['tags_sort',['../text_8php.html#aaeded36bcc983b35d9205fe5b6c18c43',1,'text.php']]],
+  ['tags_5fsort',['tags_sort',['../taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43',1,'taxonomy.php']]],
+  ['taxonomy_2ephp',['taxonomy.php',['../taxonomy_8php.html',1,'']]],
   ['template',['Template',['../classTemplate.html',1,'']]],
   ['template_5fengine',['template_engine',['../classApp.html#a94a1ed2dc493c58612d17035b74ae736',1,'App']]],
   ['template_5fescape',['template_escape',['../template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5',1,'template_processor.php']]],
@@ -19,11 +20,16 @@ var searchData=
   ['term_5ffile',['TERM_FILE',['../boot_8php.html#afb97615e985a013799839b68b99018d7',1,'boot.php']]],
   ['term_5fhashtag',['TERM_HASHTAG',['../boot_8php.html#a2750985ec445617d7e82ae3098c91e3f',1,'boot.php']]],
   ['term_5fmention',['TERM_MENTION',['../boot_8php.html#ae37444eaa42705185080ccf3e670cbc2',1,'boot.php']]],
+  ['term_5fobj_5fchannel',['TERM_OBJ_CHANNEL',['../boot_8php.html#a8892374789fd261eb32a7969d934a14a',1,'boot.php']]],
+  ['term_5fobj_5fobject',['TERM_OBJ_OBJECT',['../boot_8php.html#a882b666adfe21f035a0f8c02806066d6',1,'boot.php']]],
   ['term_5fobj_5fphoto',['TERM_OBJ_PHOTO',['../boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd',1,'boot.php']]],
   ['term_5fobj_5fpost',['TERM_OBJ_POST',['../boot_8php.html#a9eeb8989272d5ff804a616898bb13659',1,'boot.php']]],
+  ['term_5fobj_5fprofile',['TERM_OBJ_PROFILE',['../boot_8php.html#aead84fa27d7516b855220fe004964a45',1,'boot.php']]],
+  ['term_5fobj_5fthing',['TERM_OBJ_THING',['../boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe',1,'boot.php']]],
   ['term_5fpcategory',['TERM_PCATEGORY',['../boot_8php.html#a45b12aefab9675baffc7a07a09486db8',1,'boot.php']]],
-  ['term_5fquery',['term_query',['../text_8php.html#a7a913d19c77610da689be48fbbf6734c',1,'text.php']]],
+  ['term_5fquery',['term_query',['../taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c',1,'taxonomy.php']]],
   ['term_5fsavedsearch',['TERM_SAVEDSEARCH',['../boot_8php.html#abd7bb40da9cc073297e49736b338ca07',1,'boot.php']]],
+  ['term_5fthing',['TERM_THING',['../boot_8php.html#a0d877df1e20bae765e1708be50f6b503',1,'boot.php']]],
   ['term_5funknown',['TERM_UNKNOWN',['../boot_8php.html#a0c59dde058efebbc66520d136cbd1631',1,'boot.php']]],
   ['terminate_5ffriendship',['terminate_friendship',['../Contact_8php.html#a38daa1c210b78385307123450ca9a1fc',1,'Contact.php']]],
   ['termtype',['termtype',['../items_8php.html#ad34827ed330898456783fb14c7b46154',1,'items.php']]],
@@ -37,6 +43,9 @@ var searchData=
   ['theme_5finit_2ephp',['theme_init.php',['../theme_2redstrap_2php_2theme__init_8php.html',1,'']]],
   ['theme_5fpost',['theme_post',['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redstrap_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]],
   ['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]],
+  ['thing_2ephp',['thing.php',['../thing_8php.html',1,'']]],
+  ['thing_5fcontent',['thing_content',['../thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b',1,'thing.php']]],
+  ['thing_5finit',['thing_init',['../thing_8php.html#a8be23b1d475ec3d9291999221c674c80',1,'thing.php']]],
   ['timesel',['timesel',['../datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1',1,'datetime.php']]],
   ['timezone_5fcmp',['timezone_cmp',['../datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865',1,'datetime.php']]],
   ['title_5fis_5fbody',['title_is_body',['../items_8php.html#aa371905f0a211b307cb3f7188c6cba04',1,'items.php']]],
diff --git a/doc/html/search/all_78.js b/doc/html/search/all_78.js
index e19f1266e..786ddeb99 100644
--- a/doc/html/search/all_78.js
+++ b/doc/html/search/all_78.js
@@ -5,7 +5,7 @@ var searchData=
   ['xchan_5fcontent',['xchan_content',['../xchan_8php.html#a9853348bf1a35c644460221ba75edc2d',1,'xchan.php']]],
   ['xchan_5fflags_5fhidden',['XCHAN_FLAGS_HIDDEN',['../boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2',1,'boot.php']]],
   ['xchan_5fmail_5fquery',['xchan_mail_query',['../text_8php.html#a543447c5ed766535221e2d9636b379ee',1,'text.php']]],
-  ['xchan_5fquery',['xchan_query',['../text_8php.html#a24b2b69b9162da789ab6514e0e09a37c',1,'text.php']]],
+  ['xchan_5fquery',['xchan_query',['../text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f',1,'text.php']]],
   ['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]],
   ['xml_5fstatus',['xml_status',['../include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6',1,'network.php']]],
   ['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]],
diff --git a/doc/html/search/all_7a.js b/doc/html/search/all_7a.js
index 6ee67ec82..20e3146f1 100644
--- a/doc/html/search/all_7a.js
+++ b/doc/html/search/all_7a.js
@@ -10,7 +10,7 @@ var searchData=
   ['zcurl_5ftimeout',['ZCURL_TIMEOUT',['../boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af',1,'boot.php']]],
   ['zfinger_2ephp',['zfinger.php',['../zfinger_8php.html',1,'']]],
   ['zfinger_5finit',['zfinger_init',['../zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0',1,'zfinger.php']]],
-  ['zid',['zid',['../boot_8php.html#a5b7ce5c0a79796800883644c389dc87f',1,'boot.php']]],
+  ['zid',['zid',['../boot_8php.html#a5b815330f3d177ab383af37a6c12e532',1,'boot.php']]],
   ['zid_5finit',['zid_init',['../boot_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'boot.php']]],
   ['zidify_5fcallback',['zidify_callback',['../text_8php.html#a405afe814a23f3bd94d826101aa168ab',1,'text.php']]],
   ['zidify_5fimg_5fcallback',['zidify_img_callback',['../text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4',1,'text.php']]],
diff --git a/doc/html/search/files_70.js b/doc/html/search/files_70.js
index 70f2312e2..3559e86e1 100644
--- a/doc/html/search/files_70.js
+++ b/doc/html/search/files_70.js
@@ -9,6 +9,7 @@ var searchData=
   ['photo_5fimagick_2ephp',['photo_imagick.php',['../photo__imagick_8php.html',1,'']]],
   ['photos_2ephp',['photos.php',['../mod_2photos_8php.html',1,'']]],
   ['photos_2ephp',['photos.php',['../include_2photos_8php.html',1,'']]],
+  ['php_2ephp',['php.php',['../php_8php.html',1,'']]],
   ['php2po_2ephp',['php2po.php',['../php2po_8php.html',1,'']]],
   ['ping_2ephp',['ping.php',['../ping_8php.html',1,'']]],
   ['plugin_2ephp',['plugin.php',['../plugin_8php.html',1,'']]],
diff --git a/doc/html/search/files_73.js b/doc/html/search/files_73.js
index 637791c44..2be1083e1 100644
--- a/doc/html/search/files_73.js
+++ b/doc/html/search/files_73.js
@@ -4,15 +4,16 @@ var searchData=
   ['search_5fac_2ephp',['search_ac.php',['../search__ac_8php.html',1,'']]],
   ['security_2ephp',['security.php',['../security_8php.html',1,'']]],
   ['session_2ephp',['session.php',['../session_8php.html',1,'']]],
-  ['settings_2ephp',['settings.php',['../settings_8php.html',1,'']]],
+  ['settings_2ephp',['settings.php',['../include_2settings_8php.html',1,'']]],
+  ['settings_2ephp',['settings.php',['../mod_2settings_8php.html',1,'']]],
   ['setup_2ephp',['setup.php',['../setup_8php.html',1,'']]],
   ['share_2ephp',['share.php',['../share_8php.html',1,'']]],
   ['siteinfo_2ephp',['siteinfo.php',['../siteinfo_8php.html',1,'']]],
   ['smilies_2ephp',['smilies.php',['../smilies_8php.html',1,'']]],
   ['socgraph_2ephp',['socgraph.php',['../socgraph_8php.html',1,'']]],
   ['starred_2ephp',['starred.php',['../starred_8php.html',1,'']]],
-  ['style_2ephp',['style.php',['../redstrap_2php_2style_8php.html',1,'']]],
   ['style_2ephp',['style.php',['../redbasic_2php_2style_8php.html',1,'']]],
+  ['style_2ephp',['style.php',['../redstrap_2php_2style_8php.html',1,'']]],
   ['subthread_2ephp',['subthread.php',['../subthread_8php.html',1,'']]],
   ['suggest_2ephp',['suggest.php',['../suggest_8php.html',1,'']]],
   ['system_5funavailable_2ephp',['system_unavailable.php',['../system__unavailable_8php.html',1,'']]]
diff --git a/doc/html/search/files_74.js b/doc/html/search/files_74.js
index 0a8c1e445..8c09d38e2 100644
--- a/doc/html/search/files_74.js
+++ b/doc/html/search/files_74.js
@@ -2,12 +2,14 @@ var searchData=
 [
   ['tagger_2ephp',['tagger.php',['../tagger_8php.html',1,'']]],
   ['tagrm_2ephp',['tagrm.php',['../tagrm_8php.html',1,'']]],
+  ['taxonomy_2ephp',['taxonomy.php',['../taxonomy_8php.html',1,'']]],
   ['template_5fprocessor_2ephp',['template_processor.php',['../template__processor_8php.html',1,'']]],
   ['text_2ephp',['text.php',['../text_8php.html',1,'']]],
   ['theme_2ephp',['theme.php',['../redbasic_2php_2theme_8php.html',1,'']]],
   ['theme_2ephp',['theme.php',['../redstrap_2php_2theme_8php.html',1,'']]],
-  ['theme_5finit_2ephp',['theme_init.php',['../php_2theme__init_8php.html',1,'']]],
   ['theme_5finit_2ephp',['theme_init.php',['../theme_2redstrap_2php_2theme__init_8php.html',1,'']]],
+  ['theme_5finit_2ephp',['theme_init.php',['../php_2theme__init_8php.html',1,'']]],
+  ['thing_2ephp',['thing.php',['../thing_8php.html',1,'']]],
   ['toggle_5fmobile_2ephp',['toggle_mobile.php',['../toggle__mobile_8php.html',1,'']]],
   ['tpldebug_2ephp',['tpldebug.php',['../tpldebug_8php.html',1,'']]],
   ['typo_2ephp',['typo.php',['../typo_8php.html',1,'']]],
diff --git a/doc/html/search/functions_62.js b/doc/html/search/functions_62.js
index 3d7feb1aa..2d082bf9c 100644
--- a/doc/html/search/functions_62.js
+++ b/doc/html/search/functions_62.js
@@ -12,8 +12,9 @@ var searchData=
   ['bbcode',['bbcode',['../bbcode_8php.html#a009f61aaf78771737ed0765c8463911b',1,'bbcode.php']]],
   ['bbtoevent',['bbtoevent',['../event_8php.html#a180cccd63c2a2f00ff432b03113531f3',1,'event.php']]],
   ['bbtovcal',['bbtovcal',['../event_8php.html#a184d6b9690e5b6dee35a0aa9edd47279',1,'event.php']]],
-  ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#a32e7750ae6adbfdd1f227f6e89221ce3',1,'conversation.php']]],
+  ['best_5flink_5furl',['best_link_url',['../conversation_8php.html#ad470fc7766f0db66d138fa1916c7a8b7',1,'conversation.php']]],
   ['breaklines',['breaklines',['../html2plain_8php.html#a3214912e3d00cf0a948072daccf16740',1,'html2plain.php']]],
   ['build_5fpagehead',['build_pagehead',['../classApp.html#a08f0537964d98958d218066364cff785',1,'App']]],
-  ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]]
+  ['build_5fquerystring',['build_querystring',['../boot_8php.html#a9cbab4ee728e9a8b4ce952bae643044e',1,'boot.php']]],
+  ['build_5fsync_5fpacket',['build_sync_packet',['../include_2settings_8php.html#ac34e479d27f32b82dd6b33542f81a6a7',1,'settings.php']]]
 ];
diff --git a/doc/html/search/functions_63.js b/doc/html/search/functions_63.js
index cd8d23934..19525a84d 100644
--- a/doc/html/search/functions_63.js
+++ b/doc/html/search/functions_63.js
@@ -2,6 +2,7 @@ var searchData=
 [
   ['cal',['cal',['../datetime_8php.html#aea356409ba69f9de412298c998595dd2',1,'datetime.php']]],
   ['call_5fhooks',['call_hooks',['../plugin_8php.html#a7f05de16c0a32602853b09b99dd85e7c',1,'plugin.php']]],
+  ['can_5fcomment_5fon_5fpost',['can_comment_on_post',['../items_8php.html#a1e75047cf175aaee8dd16aa761913ff9',1,'items.php']]],
   ['categories_5fwidget',['categories_widget',['../contact__widgets_8php.html#a165eb021e61c4dcab2a552f28628d353',1,'contact_widgets.php']]],
   ['change_5fchannel',['change_channel',['../security_8php.html#a8d23d2597aae380a3341872fe9513380',1,'security.php']]],
   ['change_5fpermissions',['change_permissions',['../classProtoDriver.html#a34b97ca5ef2165f2e16eb2fe59ff6c67',1,'ProtoDriver\change_permissions()'],['../classZotDriver.html#a6776935156accb0f170e2e24577133db',1,'ZotDriver\change_permissions()']]],
@@ -56,6 +57,7 @@ var searchData=
   ['completeurl',['completeurl',['../parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a',1,'parse_url.php']]],
   ['connect',['connect',['../classdba__driver.html#ae533e62a240a793f17aef5ab4ef10edc',1,'dba_driver\connect()'],['../classdba__mysql.html#a1887338627ce0e28786839363014bd0b',1,'dba_mysql\connect()'],['../classdba__mysqli.html#add062bd93961e5f0194d94820e9a51b1',1,'dba_mysqli\connect()']]],
   ['connections_5faside',['connections_aside',['../connections_8php.html#af48f7ad20914760ba9874c090384e35a',1,'connections.php']]],
+  ['connections_5fclone',['connections_clone',['../connections_8php.html#a15af118efee9c948b6f8294e54a73bb2',1,'connections.php']]],
   ['connections_5fcontent',['connections_content',['../connections_8php.html#aec2e457420fce3e3bf6a9f48e36df25c',1,'connections.php']]],
   ['connections_5finit',['connections_init',['../connections_8php.html#a1f23623f802af7bd35e95b0e94e5d558',1,'connections.php']]],
   ['connections_5fpost',['connections_post',['../connections_8php.html#a1224058db8e3fb56463eb312f98e561d',1,'connections.php']]],
@@ -73,6 +75,7 @@ var searchData=
   ['contactgroup_5fcontent',['contactgroup_content',['../contactgroup_8php.html#a18c7391b1b25debaf98c9dba639caab3',1,'contactgroup.php']]],
   ['contacts_5fnot_5fgrouped',['contacts_not_grouped',['../Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc',1,'Contact.php']]],
   ['conv_5fsort',['conv_sort',['../conversation_8php.html#abed85a41f1160598de880b84021c9cf7',1,'conversation.php']]],
+  ['conversation',['conversation',['../conversation_8php.html#a1e97305a441dc143edbe09e17d1ceda1',1,'conversation.php']]],
   ['convert',['convert',['../namespacefriendica-to-smarty-tpl.html#a38503e37fe68ac27c88cce91a9ac9efa',1,'friendica-to-smarty-tpl']]],
   ['convert_5fxml_5felement_5fto_5farray',['convert_xml_element_to_array',['../include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246',1,'network.php']]],
   ['count_5fall_5ffriends',['count_all_friends',['../socgraph_8php.html#af29d056beec10b4e38e5209c92452894',1,'socgraph.php']]],
diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js
index 75f63ac03..602d5373b 100644
--- a/doc/html/search/functions_66.js
+++ b/doc/html/search/functions_66.js
@@ -10,14 +10,9 @@ var searchData=
   ['fetch_5furl',['fetch_url',['../include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a',1,'network.php']]],
   ['fetch_5fxrd_5flinks',['fetch_xrd_links',['../include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d',1,'network.php']]],
   ['field_5ftimezone',['field_timezone',['../datetime_8php.html#a03900dcf0f9e3c58793a031673a70326',1,'datetime.php']]],
-  ['file_5ftag_5fdecode',['file_tag_decode',['../text_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'text.php']]],
-  ['file_5ftag_5fencode',['file_tag_encode',['../text_8php.html#a3299482ac20e9d79453048dd52881d37',1,'text.php']]],
-  ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../text_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'text.php']]],
-  ['file_5ftag_5ffile_5fto_5flist',['file_tag_file_to_list',['../text_8php.html#a544fc13c1798371e5a5984b5482108f8',1,'text.php']]],
-  ['file_5ftag_5flist_5fto_5ffile',['file_tag_list_to_file',['../text_8php.html#abb55ec0142207aeec3d90b25ed4d7266',1,'text.php']]],
-  ['file_5ftag_5fsave_5ffile',['file_tag_save_file',['../text_8php.html#a30311fd46e05be0e2cc466118641a4ed',1,'text.php']]],
-  ['file_5ftag_5funsave_5ffile',['file_tag_unsave_file',['../text_8php.html#a48f6d04513d26270e10e9b7d153f7526',1,'text.php']]],
-  ['file_5ftag_5fupdate_5fpconfig',['file_tag_update_pconfig',['../text_8php.html#abbe4894b4e746e47e1f91c7df27f6e81',1,'text.php']]],
+  ['file_5ftag_5fdecode',['file_tag_decode',['../taxonomy_8php.html#a08df5164926d2b31b8e9fcfe919de2b6',1,'taxonomy.php']]],
+  ['file_5ftag_5fencode',['file_tag_encode',['../taxonomy_8php.html#a3299482ac20e9d79453048dd52881d37',1,'taxonomy.php']]],
+  ['file_5ftag_5ffile_5fquery',['file_tag_file_query',['../taxonomy_8php.html#a163b5131f388080b0fc82398d3a32fe1',1,'taxonomy.php']]],
   ['fileas_5fwidget',['fileas_widget',['../contact__widgets_8php.html#a1eda66319d170f60a8d07c7ece95533b',1,'contact_widgets.php']]],
   ['filer_5fcontent',['filer_content',['../filer_8php.html#a5fd5d7e61b2f9c43cb5f110c89dc4274',1,'filer.php']]],
   ['filerm_5fcontent',['filerm_content',['../filerm_8php.html#ae2eb28d2054fa2c37e38689882172208',1,'filerm.php']]],
@@ -43,9 +38,10 @@ var searchData=
   ['format_5fevent_5fdiaspora',['format_event_diaspora',['../bb2diaspora_8php.html#a29a2ad41f5826f3975fa9a49934ff863',1,'bb2diaspora.php']]],
   ['format_5fevent_5fhtml',['format_event_html',['../event_8php.html#a2ac9f1b08de03250ecd794f705781d17',1,'event.php']]],
   ['format_5fjs_5fif_5fexists',['format_js_if_exists',['../plugin_8php.html#ad9ff8ba554576383c5911a4bce068c1f',1,'plugin.php']]],
+  ['format_5flike',['format_like',['../conversation_8php.html#a3d8e30cc94f9a175054c021305d3aca3',1,'conversation.php']]],
   ['format_5flocation',['format_location',['../conversation_8php.html#a0891aaa4492cba2b51eda12fe01957f3',1,'conversation.php']]],
   ['format_5fnotification',['format_notification',['../include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3',1,'notify.php']]],
-  ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../text_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'text.php']]],
+  ['format_5fterm_5ffor_5fdisplay',['format_term_for_display',['../taxonomy_8php.html#adfead45e3b8a3dfb2b4a4b9281d0dbe1',1,'taxonomy.php']]],
   ['fsuggest_5fcontent',['fsuggest_content',['../fsuggest_8php.html#aa6c49ed4b50a387f1845f36844dd7998',1,'fsuggest.php']]],
   ['fsuggest_5fpost',['fsuggest_post',['../fsuggest_8php.html#a61ecfe10ce937ed526614f8fd3de3c7d',1,'fsuggest.php']]],
   ['ftosmarty',['fToSmarty',['../namespacefriendica-to-smarty-tpl.html#a89388ea9b2826e8218ed480e917d8105',1,'friendica-to-smarty-tpl']]]
diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js
index 6098afe23..05187723d 100644
--- a/doc/html/search/functions_67.js
+++ b/doc/html/search/functions_67.js
@@ -21,7 +21,8 @@ var searchData=
   ['get_5fchildren',['get_children',['../classItem.html#aa0ee775ec94abccec6c798428835d001',1,'Item']]],
   ['get_5fcomment_5fbox',['get_comment_box',['../classItem.html#a3ee7667c2ec6cd7657328e27848c0bdf',1,'Item']]],
   ['get_5fcomment_5fbox_5ftemplate',['get_comment_box_template',['../classItem.html#a904421c7a427411bb2ab473bca872f63',1,'Item']]],
-  ['get_5fconfig',['get_config',['../include_2config_8php.html#a5d19130818ea4c6b8726ab62cd989c15',1,'config.php']]],
+  ['get_5fconfig',['get_config',['../include_2config_8php.html#af02c96e6b37335774b548914ede1d22e',1,'config.php']]],
+  ['get_5fconfig_5ffrom_5fstorage',['get_config_from_storage',['../include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74',1,'config.php']]],
   ['get_5fconversation',['get_conversation',['../classItem.html#a0c301aaed2b7d682728d18db3a22afa3',1,'Item']]],
   ['get_5fcurl_5fcode',['get_curl_code',['../classApp.html#ab410451f132910773d0a02e35d0dced9',1,'App']]],
   ['get_5fcurl_5fheaders',['get_curl_headers',['../classApp.html#abaf2173711e861ae4aebf43a7f70157e',1,'App']]],
@@ -73,13 +74,13 @@ var searchData=
   ['get_5ftemplate_5fengine',['get_template_engine',['../classApp.html#acb27e607fe4c82603444676e25c36b70',1,'App']]],
   ['get_5ftemplate_5fldelim',['get_template_ldelim',['../classApp.html#a2eb832a8577dee7d40b93abdf6d1d35a',1,'App']]],
   ['get_5ftemplate_5frdelim',['get_template_rdelim',['../classApp.html#aab23c59172310fd30f2d60dc039d3eea',1,'App']]],
-  ['get_5fterms_5foftype',['get_terms_oftype',['../text_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'text.php']]],
-  ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
+  ['get_5fterms_5foftype',['get_terms_oftype',['../taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1',1,'taxonomy.php']]],
+  ['get_5ftheme_5fconfig_5ffile',['get_theme_config_file',['../mod_2settings_8php.html#a39abc76ff5459c57e3b957664f273f18',1,'settings.php']]],
   ['get_5ftheme_5finfo',['get_theme_info',['../plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405',1,'plugin.php']]],
   ['get_5ftheme_5fscreenshot',['get_theme_screenshot',['../plugin_8php.html#a48047edfbef770125a5508dcc2f9282f',1,'plugin.php']]],
   ['get_5fthread',['get_thread',['../classConversation.html#a4cff75d8c46b517e7133e4d0da6fc1c8',1,'Conversation']]],
   ['get_5fwidgets',['get_widgets',['../classApp.html#a871898becd0697d778f36d9336253ae8',1,'App']]],
-  ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#ae4269ab151d08b5dcb1581b2920a934b',1,'config.php']]],
+  ['get_5fxconfig',['get_xconfig',['../include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e',1,'config.php']]],
   ['getext',['getExt',['../classphoto__driver.html#aa2efb5b2a6af3fd67e3f1c2b9852a5ba',1,'photo_driver']]],
   ['getheight',['getHeight',['../classphoto__driver.html#af769e9abb144e57002c59aa2aa8f3468',1,'photo_driver']]],
   ['getimage',['getImage',['../classphoto__driver.html#ab98da263bd7341fc132c4fb6fc76e8d5',1,'photo_driver\getImage()'],['../classphoto__gd.html#a86757ba021fd80d1a5cf8c2f766a8484',1,'photo_gd\getImage()'],['../classphoto__imagick.html#ad07288e0eb3922cb08cc9d33a163decc',1,'photo_imagick\getImage()']]],
diff --git a/doc/html/search/functions_69.js b/doc/html/search/functions_69.js
index 0affc3dcd..971197efd 100644
--- a/doc/html/search/functions_69.js
+++ b/doc/html/search/functions_69.js
@@ -34,12 +34,15 @@ var searchData=
   ['is_5fwritable',['is_writable',['../classConversation.html#a5879199008b96bee7550b576d614e1c1',1,'Conversation\is_writable()'],['../classItem.html#a99253fb1ca6f430a0b181689ef206861',1,'Item\is_writable()']]],
   ['item_5fcontent',['item_content',['../item_8php.html#a764bbb2e9a885a86fb23d0b5e4a09221',1,'item.php']]],
   ['item_5fexpire',['item_expire',['../items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc',1,'items.php']]],
+  ['item_5fextract_5fimages',['item_extract_images',['../conversation_8php.html#a0ee05f15255fb1cc3d89f30bc378a654',1,'conversation.php']]],
   ['item_5fgetfeedattach',['item_getfeedattach',['../items_8php.html#a09d425596b9f8663472cf7474ad36d96',1,'items.php']]],
   ['item_5fgetfeedtags',['item_getfeedtags',['../items_8php.html#a649dc3e53ed794d0ead4b5d037f8d8d7',1,'items.php']]],
   ['item_5fmessage_5fid',['item_message_id',['../text_8php.html#aa6b0aa8afbeab50d1a3058ad21acb74e',1,'text.php']]],
   ['item_5fpermissions_5fsql',['item_permissions_sql',['../security_8php.html#a9355488460ab11d6058656ff919e5cf9',1,'security.php']]],
+  ['item_5fphoto_5fmenu',['item_photo_menu',['../conversation_8php.html#aacbb12d372d5e9c3ab0735b4aea48fb3',1,'conversation.php']]],
   ['item_5fpost',['item_post',['../item_8php.html#a693cd09805755ab85bbb5ecae69a48c3',1,'item.php']]],
   ['item_5fpost_5ftype',['item_post_type',['../text_8php.html#ac1dbf2e37e8069bea2c0f557fdbf203e',1,'text.php']]],
+  ['item_5fredir_5fand_5freplace_5fimages',['item_redir_and_replace_images',['../conversation_8php.html#adda79b75bf1ccf6ce9503aa310953533',1,'conversation.php']]],
   ['item_5fstore',['item_store',['../items_8php.html#a8ef003b2bc2dc4816bdcf5800aec1049',1,'items.php']]],
   ['item_5fstore_5fupdate',['item_store_update',['../items_8php.html#a2dc4fb9347f6fb804da4f32c107afb53',1,'items.php']]],
   ['items_5ffetch',['items_fetch',['../items_8php.html#a756738301f2ed96be50232500677d58a',1,'items.php']]]
diff --git a/doc/html/search/functions_6c.js b/doc/html/search/functions_6c.js
index ae95c7619..54c9fa6ab 100644
--- a/doc/html/search/functions_6c.js
+++ b/doc/html/search/functions_6c.js
@@ -3,6 +3,7 @@ var searchData=
   ['lang_5fselector',['lang_selector',['../text_8php.html#a71f6952243d3fe1c5a8154f78027e29c',1,'text.php']]],
   ['legal_5fwebbie',['legal_webbie',['../text_8php.html#a2690ad67bb6fb97ef69de3e8d23f2728',1,'text.php']]],
   ['like_5fcontent',['like_content',['../like_8php.html#a9d7dd268f21c21e9d29dd2aca2dd9538',1,'like.php']]],
+  ['like_5fpuller',['like_puller',['../conversation_8php.html#afe5b2f38d8b803edb0d7ec5fa2868db0',1,'conversation.php']]],
   ['limit_5fbody_5fsize',['limit_body_size',['../items_8php.html#af94c281016c6c912d06e064113336c5c',1,'items.php']]],
   ['link_5fcompare',['link_compare',['../text_8php.html#a47c1e4a5f3f53027daacd8a9db24f285',1,'text.php']]],
   ['linkify',['linkify',['../text_8php.html#a11255c8c4e5245b6c24f97684826aa54',1,'text.php']]],
@@ -12,13 +13,13 @@ var searchData=
   ['load_5fdatabase',['load_database',['../setup_8php.html#ad2e0375a9ab87ebe6e78124ee125054a',1,'setup.php']]],
   ['load_5fdatabase_5frem',['load_database_rem',['../setup_8php.html#a2b375ddc555140236fc500135de99371',1,'setup.php']]],
   ['load_5fhooks',['load_hooks',['../plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813',1,'plugin.php']]],
-  ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#ab012f852866a0aff9b5180daffa454f5',1,'config.php']]],
+  ['load_5fpconfig',['load_pconfig',['../include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6',1,'config.php']]],
   ['load_5fplugin',['load_plugin',['../plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d',1,'plugin.php']]],
   ['load_5ftranslation_5ftable',['load_translation_table',['../language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05',1,'language.php']]],
-  ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a913d4e1a6ee7acc1598c69b902c06fd2',1,'config.php']]],
+  ['load_5fxconfig',['load_xconfig',['../include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33',1,'config.php']]],
   ['local_5fdelivery',['local_delivery',['../items_8php.html#ae1c27d1a6379231ac7c0435c8a791d45',1,'items.php']]],
   ['local_5fuser',['local_user',['../boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44',1,'boot.php']]],
-  ['localize_5fitem',['localize_item',['../conversation_8php.html#afea815dd1768e8417d2b30be53e9e0b4',1,'conversation.php']]],
+  ['localize_5fitem',['localize_item',['../conversation_8php.html#a9bd7f9fb6678736c581bcba3b17f471c',1,'conversation.php']]],
   ['lockview_5fcontent',['lockview_content',['../lockview_8php.html#a851e26ab9a1008df5c5ebebea31e9b44',1,'lockview.php']]],
   ['logger',['logger',['../text_8php.html#a030fa5ecc64168af0c4f44897a9bce63',1,'text.php']]],
   ['login',['login',['../boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4',1,'boot.php']]],
diff --git a/doc/html/search/functions_70.js b/doc/html/search/functions_70.js
index 29273fc57..a29a9886d 100644
--- a/doc/html/search/functions_70.js
+++ b/doc/html/search/functions_70.js
@@ -25,6 +25,7 @@ var searchData=
   ['photos_5finit',['photos_init',['../mod_2photos_8php.html#ab950295cd77626f5fe65331a87693014',1,'photos.php']]],
   ['photos_5flist_5fphotos',['photos_list_photos',['../include_2photos_8php.html#aa27b9e435dcc34e1009f56dc02c7ca51',1,'photos.php']]],
   ['photos_5fpost',['photos_post',['../mod_2photos_8php.html#a062bed4d04d14fee8a53f4c9be673080',1,'photos.php']]],
+  ['php_5finit',['php_init',['../php_8php.html#adb7164dfed9a4ecbe2e168e1e78f12f6',1,'php.php']]],
   ['ping_5finit',['ping_init',['../ping_8php.html#a77217b1b190b4c5d8770867b45f0c0a1',1,'ping.php']]],
   ['pkcs1_5fencode',['pkcs1_encode',['../crypto_8php.html#a890b443f80f0968fb9eabd93fc99dbb5',1,'crypto.php']]],
   ['pkcs5_5fpad',['pkcs5_pad',['../crypto_8php.html#a3398666e184faf8e516c8e5d91de86eb',1,'crypto.php']]],
diff --git a/doc/html/search/functions_73.js b/doc/html/search/functions_73.js
index 4d25f8100..8717244d1 100644
--- a/doc/html/search/functions_73.js
+++ b/doc/html/search/functions_73.js
@@ -48,8 +48,8 @@ var searchData=
   ['set_5fwidget',['set_widget',['../classApp.html#a123b903dfe5d3488cc68db3471d36fd2',1,'App']]],
   ['set_5fxconfig',['set_xconfig',['../include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e',1,'config.php']]],
   ['setdimensions',['setDimensions',['../classphoto__driver.html#ae663867d2c4eaa2fae50d60670920143',1,'photo_driver\setDimensions()'],['../classphoto__gd.html#a1c75304bd15f3b9986f0b315fb59271e',1,'photo_gd\setDimensions()'],['../classphoto__imagick.html#af92901d252c1e6ab5b54eebedbed23bb',1,'photo_imagick\setDimensions()']]],
-  ['settings_5faside',['settings_aside',['../settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
-  ['settings_5fpost',['settings_post',['../settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
+  ['settings_5faside',['settings_aside',['../mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582',1,'settings.php']]],
+  ['settings_5fpost',['settings_post',['../mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586',1,'settings.php']]],
   ['setup_5fcontent',['setup_content',['../setup_8php.html#a88247384a96e14516f474d7af6a465c1',1,'setup.php']]],
   ['setup_5finit',['setup_init',['../setup_8php.html#a267555abd17290e659b4bf44b885e4e0',1,'setup.php']]],
   ['setup_5fpost',['setup_post',['../setup_8php.html#a13cf286774149a0a7bd8adb8179cec75',1,'setup.php']]],
@@ -69,9 +69,9 @@ var searchData=
   ['sort_5fthr_5fcreated_5frev',['sort_thr_created_rev',['../conversation_8php.html#a9cc2a679606da9e535a06433f9f553a0',1,'conversation.php']]],
   ['starred_5finit',['starred_init',['../starred_8php.html#a63024fb418c678e49fd535e3752d349a',1,'starred.php']]],
   ['startup',['startup',['../boot_8php.html#aca47505b8732177f52bb2d647eb2741c',1,'boot.php']]],
-  ['status_5feditor',['status_editor',['../conversation_8php.html#aedf008b9eac87f693d7dcc1a01404d85',1,'conversation.php']]],
+  ['status_5feditor',['status_editor',['../conversation_8php.html#a2a7d541854bba755eb8ada59af7dcb1a',1,'conversation.php']]],
   ['store',['store',['../classphoto__driver.html#a642a8d0c4ad5f887c99c6af77cee287b',1,'photo_driver']]],
-  ['store_5fitem_5ftag',['store_item_tag',['../text_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'text.php']]],
+  ['store_5fitem_5ftag',['store_item_tag',['../taxonomy_8php.html#a4ba1339b2a7054971178ce194e4440fd',1,'taxonomy.php']]],
   ['stream_5fperms_5fapi_5fuids',['stream_perms_api_uids',['../security_8php.html#ae92c5c1a1cbbc49ddbb8b3265d2db809',1,'security.php']]],
   ['string_5fplural_5fselect_5fdefault',['string_plural_select_default',['../language_8php.html#a151e5b4689aef86a12642cbb7a00bfe0',1,'language.php']]],
   ['stringify_5farray_5felms',['stringify_array_elms',['../text_8php.html#a8796f6a9ca592ecdce7b3afc3462aa13',1,'text.php']]],
diff --git a/doc/html/search/functions_74.js b/doc/html/search/functions_74.js
index c8db49e83..9b46593ef 100644
--- a/doc/html/search/functions_74.js
+++ b/doc/html/search/functions_74.js
@@ -2,16 +2,16 @@ var searchData=
 [
   ['t',['t',['../language_8php.html#aae0c3638fb476ae1e31f8d242f5dac04',1,'language.php']]],
   ['tag_5fdeliver',['tag_deliver',['../items_8php.html#ab1bce4261bcf75ad62753b498a144d17',1,'items.php']]],
-  ['tagadelic',['tagadelic',['../text_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'text.php']]],
-  ['tagblock',['tagblock',['../text_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'text.php']]],
+  ['tagadelic',['tagadelic',['../taxonomy_8php.html#afe44c30f1d0f8cb3ca097d4e189d852d',1,'taxonomy.php']]],
+  ['tagblock',['tagblock',['../taxonomy_8php.html#a4f3605ee8de717a401ea9df2401b59f6',1,'taxonomy.php']]],
   ['tagger_5fcontent',['tagger_content',['../tagger_8php.html#a0e4a3eb177d1684553c547503d67161c',1,'tagger.php']]],
   ['tagrm_5fcontent',['tagrm_content',['../tagrm_8php.html#adfd4ea5b4d7fc6d9c9e042af5cd7d49a',1,'tagrm.php']]],
   ['tagrm_5fpost',['tagrm_post',['../tagrm_8php.html#a1702f40aa53a2fa93deade1f609abe78',1,'tagrm.php']]],
-  ['tags_5fsort',['tags_sort',['../text_8php.html#aaeded36bcc983b35d9205fe5b6c18c43',1,'text.php']]],
+  ['tags_5fsort',['tags_sort',['../taxonomy_8php.html#aaeded36bcc983b35d9205fe5b6c18c43',1,'taxonomy.php']]],
   ['template_5fengine',['template_engine',['../classApp.html#a94a1ed2dc493c58612d17035b74ae736',1,'App']]],
   ['template_5fescape',['template_escape',['../template__processor_8php.html#ab2bcd8738f20f293636a6ae8e1099db5',1,'template_processor.php']]],
   ['template_5funescape',['template_unescape',['../template__processor_8php.html#ac635bb19a5f6eadd6b0cddefdd537c1e',1,'template_processor.php']]],
-  ['term_5fquery',['term_query',['../text_8php.html#a7a913d19c77610da689be48fbbf6734c',1,'text.php']]],
+  ['term_5fquery',['term_query',['../taxonomy_8php.html#a7a913d19c77610da689be48fbbf6734c',1,'taxonomy.php']]],
   ['terminate_5ffriendship',['terminate_friendship',['../Contact_8php.html#a38daa1c210b78385307123450ca9a1fc',1,'Contact.php']]],
   ['termtype',['termtype',['../items_8php.html#ad34827ed330898456783fb14c7b46154',1,'items.php']]],
   ['tgroup_5fcheck',['tgroup_check',['../items_8php.html#a88c6cf7649ac836fbbed82a7a0315110',1,'items.php']]],
@@ -19,6 +19,8 @@ var searchData=
   ['theme_5finclude',['theme_include',['../plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2',1,'plugin.php']]],
   ['theme_5fpost',['theme_post',['../view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php'],['../view_2theme_2redstrap_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6',1,'theme_post(&$a): config.php']]],
   ['theme_5fstatus',['theme_status',['../admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4',1,'admin.php']]],
+  ['thing_5fcontent',['thing_content',['../thing_8php.html#a24a35f1e64029a67fdbea94a776ae04b',1,'thing.php']]],
+  ['thing_5finit',['thing_init',['../thing_8php.html#a8be23b1d475ec3d9291999221c674c80',1,'thing.php']]],
   ['timesel',['timesel',['../datetime_8php.html#a36d3d6dff8d76b5f295bb3d9c535a5b1',1,'datetime.php']]],
   ['timezone_5fcmp',['timezone_cmp',['../datetime_8php.html#aa51b5a7ea4f931b23acbdfcea46e9865',1,'datetime.php']]],
   ['title_5fis_5fbody',['title_is_body',['../items_8php.html#aa371905f0a211b307cb3f7188c6cba04',1,'items.php']]],
diff --git a/doc/html/search/functions_78.js b/doc/html/search/functions_78.js
index 4a65e7703..0f98f99b9 100644
--- a/doc/html/search/functions_78.js
+++ b/doc/html/search/functions_78.js
@@ -3,7 +3,7 @@ var searchData=
   ['x',['x',['../boot_8php.html#a01353c9abebc3544ea080ac161729632',1,'boot.php']]],
   ['xchan_5fcontent',['xchan_content',['../xchan_8php.html#a9853348bf1a35c644460221ba75edc2d',1,'xchan.php']]],
   ['xchan_5fmail_5fquery',['xchan_mail_query',['../text_8php.html#a543447c5ed766535221e2d9636b379ee',1,'text.php']]],
-  ['xchan_5fquery',['xchan_query',['../text_8php.html#a24b2b69b9162da789ab6514e0e09a37c',1,'text.php']]],
+  ['xchan_5fquery',['xchan_query',['../text_8php.html#a36a2e5d418ee81140f25c4233cfecd1f',1,'text.php']]],
   ['xml2array',['xml2array',['../include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff',1,'network.php']]],
   ['xml_5fstatus',['xml_status',['../include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6',1,'network.php']]],
   ['xmlify',['xmlify',['../text_8php.html#aaed4413ed8918838b517e3b2fafaea0d',1,'text.php']]],
diff --git a/doc/html/search/functions_7a.js b/doc/html/search/functions_7a.js
index 0d5d073c4..9c1b34db7 100644
--- a/doc/html/search/functions_7a.js
+++ b/doc/html/search/functions_7a.js
@@ -8,7 +8,7 @@ var searchData=
   ['z_5freaddir',['z_readdir',['../include_2attach_8php.html#aeb07968990e66a88c95483ca09a7f909',1,'attach.php']]],
   ['z_5froot',['z_root',['../boot_8php.html#add517a0958ac684792c62142a3877f81',1,'boot.php']]],
   ['zfinger_5finit',['zfinger_init',['../zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0',1,'zfinger.php']]],
-  ['zid',['zid',['../boot_8php.html#a5b7ce5c0a79796800883644c389dc87f',1,'boot.php']]],
+  ['zid',['zid',['../boot_8php.html#a5b815330f3d177ab383af37a6c12e532',1,'boot.php']]],
   ['zid_5finit',['zid_init',['../boot_8php.html#a680fbafc2db023c5b1309e0180e81315',1,'boot.php']]],
   ['zidify_5fcallback',['zidify_callback',['../text_8php.html#a405afe814a23f3bd94d826101aa168ab',1,'text.php']]],
   ['zidify_5fimg_5fcallback',['zidify_img_callback',['../text_8php.html#ab4a4c3d4700bc219bb84f33b499314f4',1,'text.php']]],
diff --git a/doc/html/search/variables_61.js b/doc/html/search/variables_61.js
index 58172f5d8..95336c00b 100644
--- a/doc/html/search/variables_61.js
+++ b/doc/html/search/variables_61.js
@@ -32,6 +32,7 @@ var searchData=
   ['activity_5fobj_5fphoto',['ACTIVITY_OBJ_PHOTO',['../boot_8php.html#a774f0f792ebfec1e774c5a17bb9d5966',1,'boot.php']]],
   ['activity_5fobj_5fprofile',['ACTIVITY_OBJ_PROFILE',['../boot_8php.html#a62c832a95e38b1fa23e6cef39521b7d5',1,'boot.php']]],
   ['activity_5fobj_5ftagterm',['ACTIVITY_OBJ_TAGTERM',['../boot_8php.html#a1da180f961f49a11573cac4ff6c62c05',1,'boot.php']]],
+  ['activity_5fobj_5fthing',['ACTIVITY_OBJ_THING',['../boot_8php.html#a0fb63e51c2a9814941842ae8f2f4dff8',1,'boot.php']]],
   ['activity_5fpoke',['ACTIVITY_POKE',['../boot_8php.html#a14ba8f9e162f2559831ee3bf98e0c3bd',1,'boot.php']]],
   ['activity_5fpost',['ACTIVITY_POST',['../boot_8php.html#a5c3747e0f505f0d5271dc4c54e3feaf4',1,'boot.php']]],
   ['activity_5freq_5ffriend',['ACTIVITY_REQ_FRIEND',['../boot_8php.html#afe084c30a1810c10442edb4fbcbc0086',1,'boot.php']]],
diff --git a/doc/html/search/variables_69.js b/doc/html/search/variables_69.js
index 484c857dc..97df485bf 100644
--- a/doc/html/search/variables_69.js
+++ b/doc/html/search/variables_69.js
@@ -7,6 +7,7 @@ var searchData=
   ['item_5fhidden',['ITEM_HIDDEN',['../boot_8php.html#ac99fc4d040764eac1736bec6973556fe',1,'boot.php']]],
   ['item_5fmentionsme',['ITEM_MENTIONSME',['../boot_8php.html#a8da836617174eed9fc2ac8054125354b',1,'boot.php']]],
   ['item_5fmoderated',['ITEM_MODERATED',['../boot_8php.html#ac01230c7655e0705b2e99c9bc03c4450',1,'boot.php']]],
+  ['item_5fnocomment',['ITEM_NOCOMMENT',['../boot_8php.html#a949116d9a295b214293006c060ca4848',1,'boot.php']]],
   ['item_5fnotshown',['ITEM_NOTSHOWN',['../boot_8php.html#a8663f32171568489dbb2a01dd00371f8',1,'boot.php']]],
   ['item_5fnsfw',['ITEM_NSFW',['../boot_8php.html#a939de9a99278f4fd7dcd0ee67f243f08',1,'boot.php']]],
   ['item_5forigin',['ITEM_ORIGIN',['../boot_8php.html#a8c9dce0ef27b35397e29298eb966f7f7',1,'boot.php']]],
diff --git a/doc/html/search/variables_74.js b/doc/html/search/variables_74.js
index 571eac098..e36593332 100644
--- a/doc/html/search/variables_74.js
+++ b/doc/html/search/variables_74.js
@@ -4,10 +4,15 @@ var searchData=
   ['term_5ffile',['TERM_FILE',['../boot_8php.html#afb97615e985a013799839b68b99018d7',1,'boot.php']]],
   ['term_5fhashtag',['TERM_HASHTAG',['../boot_8php.html#a2750985ec445617d7e82ae3098c91e3f',1,'boot.php']]],
   ['term_5fmention',['TERM_MENTION',['../boot_8php.html#ae37444eaa42705185080ccf3e670cbc2',1,'boot.php']]],
+  ['term_5fobj_5fchannel',['TERM_OBJ_CHANNEL',['../boot_8php.html#a8892374789fd261eb32a7969d934a14a',1,'boot.php']]],
+  ['term_5fobj_5fobject',['TERM_OBJ_OBJECT',['../boot_8php.html#a882b666adfe21f035a0f8c02806066d6',1,'boot.php']]],
   ['term_5fobj_5fphoto',['TERM_OBJ_PHOTO',['../boot_8php.html#a64617d4655804de2a3c86501ab4fdbfd',1,'boot.php']]],
   ['term_5fobj_5fpost',['TERM_OBJ_POST',['../boot_8php.html#a9eeb8989272d5ff804a616898bb13659',1,'boot.php']]],
+  ['term_5fobj_5fprofile',['TERM_OBJ_PROFILE',['../boot_8php.html#aead84fa27d7516b855220fe004964a45',1,'boot.php']]],
+  ['term_5fobj_5fthing',['TERM_OBJ_THING',['../boot_8php.html#a0cc8dc76bd10ac0ec81bac08a46f82fe',1,'boot.php']]],
   ['term_5fpcategory',['TERM_PCATEGORY',['../boot_8php.html#a45b12aefab9675baffc7a07a09486db8',1,'boot.php']]],
   ['term_5fsavedsearch',['TERM_SAVEDSEARCH',['../boot_8php.html#abd7bb40da9cc073297e49736b338ca07',1,'boot.php']]],
+  ['term_5fthing',['TERM_THING',['../boot_8php.html#a0d877df1e20bae765e1708be50f6b503',1,'boot.php']]],
   ['term_5funknown',['TERM_UNKNOWN',['../boot_8php.html#a0c59dde058efebbc66520d136cbd1631',1,'boot.php']]],
   ['tplpaths',['tplpaths',['../namespaceupdatetpl.html#a52a85ffa6b6d63d840b185a133478c12',1,'updatetpl']]]
 ];