Merge remote-tracking branch 'upstream/master'

6 files changed, 13 insertions, 1 deletions

diff --git a/doc/html/search/all_66.js b/doc/html/search/all_66.js
index 46634f7ba..10cab8f63 100644
--- a/doc/html/search/all_66.js
+++ b/doc/html/search/all_66.js
@@ -25,9 +25,13 @@ var searchData=
   ['filestorage_2ephp',['filestorage.php',['../filestorage_8php.html',1,'']]],
   ['filestorage_5fcontent',['filestorage_content',['../filestorage_8php.html#a61bb1be78472555df4ce619f51014040',1,'filestorage.php']]],
   ['filestorage_5fpost',['filestorage_post',['../filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd',1,'filestorage.php']]],
+  ['find_5ffilename_5fby_5fhash',['find_filename_by_hash',['../include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86',1,'attach.php']]],
+  ['find_5ffolder_5fhash_5fby_5fattach_5fhash',['find_folder_hash_by_attach_hash',['../include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997',1,'attach.php']]],
   ['find_5fthread_5fparent_5findex',['find_thread_parent_index',['../conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6',1,'conversation.php']]],
   ['find_5fupstream_5fdirectory',['find_upstream_directory',['../dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d',1,'dir_fns.php']]],
   ['find_5fxchan_5fin_5farray',['find_xchan_in_array',['../text_8php.html#ace3c98538c63e09b70a363210b414112',1,'text.php']]],
+  ['findattachhash',['findAttachHash',['../classRedBrowser.html#ae4edd4e10c709e2624c1aeb47b0440c5',1,'RedBrowser']]],
+  ['findattachidbyhash',['findAttachIdByHash',['../classRedBrowser.html#a20d81230645ddca08a88bfd9ea9f88f1',1,'RedBrowser']]],
   ['findpeople_5fwidget',['findpeople_widget',['../contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6',1,'contact_widgets.php']]],
   ['first_5fpost_5fdate',['first_post_date',['../items_8php.html#a0cf98bb619f07dd18f602683a55a5f59',1,'items.php']]],
   ['fix_5fattached_5ffile_5fpermissions',['fix_attached_file_permissions',['../item_8php.html#a3daae7944f737bd30412a0d042207c0f',1,'item.php']]],
diff --git a/doc/html/search/all_67.js b/doc/html/search/all_67.js
index 0914ac52d..c45a3b887 100644
--- a/doc/html/search/all_67.js
+++ b/doc/html/search/all_67.js
@@ -63,6 +63,7 @@ var searchData=
   ['get_5fowner_5fphoto',['get_owner_photo',['../classItem.html#aa541bc4290e51bfd688d6921bebabc73',1,'Item']]],
   ['get_5fowner_5furl',['get_owner_url',['../classItem.html#a9f2d219da712390f59012fc32a342074',1,'Item']]],
   ['get_5fparent',['get_parent',['../classItem.html#a4b92e3a9d6212c553aa2661489bd95d8',1,'Item']]],
+  ['get_5fparent_5fcloudpath',['get_parent_cloudpath',['../include_2attach_8php.html#a1d72ef7cb940f6868e3e2a841cadfe8f',1,'attach.php']]],
   ['get_5fpath',['get_path',['../classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be',1,'App']]],
   ['get_5fpconfig',['get_pconfig',['../include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad',1,'config.php']]],
   ['get_5fperms',['get_perms',['../classApp.html#adb5a4bb657881e553978ff390babd01f',1,'App\get_perms()'],['../permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972',1,'get_perms(): permissions.php']]],
diff --git a/doc/html/search/all_75.js b/doc/html/search/all_75.js
index 167802830..6016cafb1 100644
--- a/doc/html/search/all_75.js
+++ b/doc/html/search/all_75.js
@@ -38,5 +38,6 @@ var searchData=
   ['user_5fallow',['user_allow',['../account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1',1,'account.php']]],
   ['user_5fdeny',['user_deny',['../account_8php.html#ac1653efba62493b9d87513e1b6c04c83',1,'account.php']]],
   ['user_5fremove',['user_remove',['../Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15',1,'Contact.php']]],
+  ['userreadablesize',['userReadableSize',['../classRedBrowser.html#ad3418b8ccad42a1ef4ad0079e15b2e64',1,'RedBrowser']]],
   ['util',['util',['../namespaceutil.html',1,'']]]
 ];
diff --git a/doc/html/search/functions_66.js b/doc/html/search/functions_66.js
index 2ac10c059..0a3667bfb 100644
--- a/doc/html/search/functions_66.js
+++ b/doc/html/search/functions_66.js
@@ -16,9 +16,13 @@ var searchData=
   ['filerm_5fcontent',['filerm_content',['../filerm_8php.html#ae2eb28d2054fa2c37e38689882172208',1,'filerm.php']]],
   ['filestorage_5fcontent',['filestorage_content',['../filestorage_8php.html#a61bb1be78472555df4ce619f51014040',1,'filestorage.php']]],
   ['filestorage_5fpost',['filestorage_post',['../filestorage_8php.html#ad3b64e3ece9831f9d3a9f00c0ae983cd',1,'filestorage.php']]],
+  ['find_5ffilename_5fby_5fhash',['find_filename_by_hash',['../include_2attach_8php.html#a4dbfd7e1cef52aa9ef52f4b88929fa86',1,'attach.php']]],
+  ['find_5ffolder_5fhash_5fby_5fattach_5fhash',['find_folder_hash_by_attach_hash',['../include_2attach_8php.html#a052f14487ff2ce72f62a09fac8d7e997',1,'attach.php']]],
   ['find_5fthread_5fparent_5findex',['find_thread_parent_index',['../conversation_8php.html#ae59703b07ce2ddf627b4172ff26058b6',1,'conversation.php']]],
   ['find_5fupstream_5fdirectory',['find_upstream_directory',['../dir__fns_8php.html#a8c15aa69da12f2d3476b9e93b82b337d',1,'dir_fns.php']]],
   ['find_5fxchan_5fin_5farray',['find_xchan_in_array',['../text_8php.html#ace3c98538c63e09b70a363210b414112',1,'text.php']]],
+  ['findattachhash',['findAttachHash',['../classRedBrowser.html#ae4edd4e10c709e2624c1aeb47b0440c5',1,'RedBrowser']]],
+  ['findattachidbyhash',['findAttachIdByHash',['../classRedBrowser.html#a20d81230645ddca08a88bfd9ea9f88f1',1,'RedBrowser']]],
   ['findpeople_5fwidget',['findpeople_widget',['../contact__widgets_8php.html#a57e73ebcfd62bb5d8c7a7b9e663726d6',1,'contact_widgets.php']]],
   ['first_5fpost_5fdate',['first_post_date',['../items_8php.html#a0cf98bb619f07dd18f602683a55a5f59',1,'items.php']]],
   ['fix_5fattached_5ffile_5fpermissions',['fix_attached_file_permissions',['../item_8php.html#a3daae7944f737bd30412a0d042207c0f',1,'item.php']]],
diff --git a/doc/html/search/functions_67.js b/doc/html/search/functions_67.js
index 65ceefc89..d0a08af1b 100644
--- a/doc/html/search/functions_67.js
+++ b/doc/html/search/functions_67.js
@@ -63,6 +63,7 @@ var searchData=
   ['get_5fowner_5fphoto',['get_owner_photo',['../classItem.html#aa541bc4290e51bfd688d6921bebabc73',1,'Item']]],
   ['get_5fowner_5furl',['get_owner_url',['../classItem.html#a9f2d219da712390f59012fc32a342074',1,'Item']]],
   ['get_5fparent',['get_parent',['../classItem.html#a4b92e3a9d6212c553aa2661489bd95d8',1,'Item']]],
+  ['get_5fparent_5fcloudpath',['get_parent_cloudpath',['../include_2attach_8php.html#a1d72ef7cb940f6868e3e2a841cadfe8f',1,'attach.php']]],
   ['get_5fpath',['get_path',['../classApp.html#a5293a8543ba338dcf38cd4ff3bc5d4be',1,'App']]],
   ['get_5fpconfig',['get_pconfig',['../include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad',1,'config.php']]],
   ['get_5fperms',['get_perms',['../classApp.html#adb5a4bb657881e553978ff390babd01f',1,'App\get_perms()'],['../permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972',1,'get_perms(): permissions.php']]],
diff --git a/doc/html/search/functions_75.js b/doc/html/search/functions_75.js
index 060e2c7de..c8f37fe62 100644
--- a/doc/html/search/functions_75.js
+++ b/doc/html/search/functions_75.js
@@ -25,5 +25,6 @@ var searchData=
   ['upgrade_5fmessage',['upgrade_message',['../plugin_8php.html#a901657dd078e070516cf97285e0bada7',1,'plugin.php']]],
   ['user_5fallow',['user_allow',['../account_8php.html#ac5c570a2d46446bad4dd2501e9c5a4b1',1,'account.php']]],
   ['user_5fdeny',['user_deny',['../account_8php.html#ac1653efba62493b9d87513e1b6c04c83',1,'account.php']]],
-  ['user_5fremove',['user_remove',['../Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15',1,'Contact.php']]]
+  ['user_5fremove',['user_remove',['../Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15',1,'Contact.php']]],
+  ['userreadablesize',['userReadableSize',['../classRedBrowser.html#ad3418b8ccad42a1ef4ad0079e15b2e64',1,'RedBrowser']]]
 ];