Merge remote-tracking branch 'upstream/master' into bootstrap

Conflicts:
	view/php/theme_init.php

1 files changed, 54 insertions, 54 deletions

diff --git a/doc/html/navtreeindex4.js b/doc/html/navtreeindex4.js
index a9a8c6b22..06c60cd20 100644
--- a/doc/html/navtreeindex4.js
+++ b/doc/html/navtreeindex4.js
@@ -13,8 +13,8 @@ var NAVTREEINDEX4 =
 "globals_0x77.html":[5,1,0,24],
 "globals_0x78.html":[5,1,0,25],
 "globals_0x7a.html":[5,1,0,26],
-"globals_func.html":[5,1,1,0],
 "globals_func.html":[5,1,1],
+"globals_func.html":[5,1,1,0],
 "globals_func_0x61.html":[5,1,1,1],
 "globals_func_0x62.html":[5,1,1,2],
 "globals_func_0x63.html":[5,1,1,3],
@@ -66,15 +66,15 @@ var NAVTREEINDEX4 =
 "gprobe_8php.html":[5,0,0,34],
 "gprobe_8php.html#adf72cb0a70b5b9d99fdec1cc60e18ed1":[5,0,0,34,0],
 "greenthumbnails_8php.html":[5,0,3,1,0,1,3],
-"hcard_8php.html":[5,0,1,35],
-"hcard_8php.html#a956c7cae2009652a37900306e5b7b73d":[5,0,1,35,0],
-"hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d":[5,0,1,35,1],
-"help_8php.html":[5,0,1,36],
-"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,36,0],
+"help_8php.html":[5,0,1,34],
+"help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4":[5,0,1,34,1],
+"help_8php.html#af055e15f600ffa6fbca9386fdf715224":[5,0,1,34,0],
 "hierarchy.html":[4,2],
-"home_8php.html":[5,0,1,37],
-"hostxrd_8php.html":[5,0,1,38],
-"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,38,0],
+"home_8php.html":[5,0,1,35],
+"home_8php.html#aa1cf697851a646755baf537f75334c46":[5,0,1,35,0],
+"home_8php.html#ac4642c38b6f23a8d065dd4a75c620bde":[5,0,1,35,1],
+"hostxrd_8php.html":[5,0,1,36],
+"hostxrd_8php.html#aa37ffc8e7900bc76c4828bd25916db92":[5,0,1,36,0],
 "html2bbcode_8php.html":[5,0,0,36],
 "html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7":[5,0,0,36,3],
 "html2bbcode_8php.html#a5ad726995ac4070213abdb3bd09f4837":[5,0,0,36,1],
@@ -86,17 +86,28 @@ var NAVTREEINDEX4 =
 "html2plain_8php.html#ab3e121fa9f3feb16f9f942e705bc6c04":[5,0,0,37,2],
 "html2plain_8php.html#ae1c203d0f089d5678d73a6c64a395201":[5,0,0,37,1],
 "identity_8php.html":[5,0,0,38],
-"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,38,2],
-"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,38,3],
-"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,38,0],
-"identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485":[5,0,0,38,4],
-"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,38,6],
-"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,38,1],
-"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,38,5],
-"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,38,7],
-"import_8php.html":[5,0,1,39],
-"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,39,1],
-"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,39,0],
+"identity_8php.html#a345f4c943d84de502ec6e72d2c813945":[5,0,0,38,3],
+"identity_8php.html#a3570a4eb77332b292d394c4132cb8f03":[5,0,0,38,10],
+"identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc":[5,0,0,38,14],
+"identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68":[5,0,0,38,13],
+"identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2":[5,0,0,38,7],
+"identity_8php.html#a5b815330f3d177ab383af37a6c12e532":[5,0,0,38,17],
+"identity_8php.html#a680fbafc2db023c5b1309e0180e81315":[5,0,0,38,18],
+"identity_8php.html#a77d2237f1846964634b1c99089c27c7d":[5,0,0,38,1],
+"identity_8php.html#a78151baf4407a8482d2681a91a9c486b":[5,0,0,38,15],
+"identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec":[5,0,0,38,8],
+"identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4":[5,0,0,38,0],
+"identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3":[5,0,0,38,9],
+"identity_8php.html#ab1485a26b032956e1496fc08c58b83ed":[5,0,0,38,5],
+"identity_8php.html#abf6a9c6ed92d594f1d4513c4e22a7abd":[5,0,0,38,2],
+"identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633":[5,0,0,38,11],
+"identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51":[5,0,0,38,4],
+"identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620":[5,0,0,38,12],
+"identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312":[5,0,0,38,6],
+"identity_8php.html#af2802bc13a00a17b867bba7978ba8f58":[5,0,0,38,16],
+"import_8php.html":[5,0,1,37],
+"import_8php.html#af17fef0410518f7eac205d0ea416eaa2":[5,0,1,37,1],
+"import_8php.html#afdf25ed70096d5dbf4f6d0ca79fea184":[5,0,1,37,0],
 "include_2api_8php.html":[5,0,0,5],
 "include_2api_8php.html#a0991f72554f821255397d615e76f3203":[5,0,0,5,12],
 "include_2api_8php.html#a176c448d79c211ad41c2bbe3124658f5":[5,0,0,5,5],
@@ -183,13 +194,13 @@ var NAVTREEINDEX4 =
 "include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b":[5,0,0,35,2],
 "include_2group_8php.html#a048f6892bfd28852de1b76470df411de":[5,0,0,35,10],
 "include_2group_8php.html#a06ec565d2b64e79044e7c1bf91a2a4ce":[5,0,0,35,1],
-"include_2group_8php.html#a1042d74055bafe54a6a30103d87a7f17":[5,0,0,35,8],
 "include_2group_8php.html#a22a81875259c7d3d64d4848afea6b345":[5,0,0,35,0],
 "include_2group_8php.html#a4118f498bbd1530c1d0136d016d197a5":[5,0,0,35,6],
 "include_2group_8php.html#a540e3ef36f47d47532646be4241f6518":[5,0,0,35,7],
 "include_2group_8php.html#a5bd191d9692e6c34d48c0ede10810f09":[5,0,0,35,4],
+"include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9":[5,0,0,35,8],
 "include_2group_8php.html#a90e157b3e1b99c981809cb5a2abd3245":[5,0,0,35,5],
-"include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f":[5,0,0,35,11],
+"include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32":[5,0,0,35,11],
 "include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb":[5,0,0,35,3],
 "include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f":[5,0,0,35,9],
 "include_2menu_8php.html":[5,0,0,43],
@@ -211,32 +222,26 @@ var NAVTREEINDEX4 =
 "include_2message_8php.html#a751ffd6635022b2190f56154ee745752":[5,0,0,44,4],
 "include_2message_8php.html#aed272d77c06a309e2836ac79e75613f1":[5,0,0,44,0],
 "include_2network_8php.html":[5,0,0,46],
-"include_2network_8php.html#a0bdc4b0bfc54797c249dc4eca25aeda4":[5,0,0,46,0],
-"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[5,0,0,46,6],
-"include_2network_8php.html#a2729d012410e470c527a62a3f777ded8":[5,0,0,46,10],
-"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[5,0,0,46,15],
-"include_2network_8php.html#a37ddeb88a3fd1dee9e8339723f9edf9a":[5,0,0,46,8],
-"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[5,0,0,46,5],
-"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[5,0,0,46,13],
-"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[5,0,0,46,12],
-"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[5,0,0,46,19],
-"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[5,0,0,46,11],
-"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[5,0,0,46,20],
-"include_2network_8php.html#a850ed5307c6a18076f4b80addc99602d":[5,0,0,46,9],
-"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[5,0,0,46,18],
-"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[5,0,0,46,7],
-"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[5,0,0,46,25],
-"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[5,0,0,46,22],
-"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[5,0,0,46,23],
-"include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e":[5,0,0,46,16],
-"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[5,0,0,46,24],
-"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,46,3],
-"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,46,1],
-"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,46,4],
-"include_2network_8php.html#adbc7fe45cc7fd9cd78f6b2f425ee9041":[5,0,0,46,14],
-"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,46,21],
-"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,46,17],
-"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,46,2],
+"include_2network_8php.html#a1ff07d9fad93b713b93da0ab77aab7f0":[5,0,0,46,5],
+"include_2network_8php.html#a27a951b59d8d622c0b3e7b0673ba74c6":[5,0,0,46,10],
+"include_2network_8php.html#a469b9bd700269cd07d954f1a16c5899b":[5,0,0,46,4],
+"include_2network_8php.html#a4c5d50079e089168d9248427018fffd4":[5,0,0,46,9],
+"include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2":[5,0,0,46,8],
+"include_2network_8php.html#a5caa264fab6d2b2344e6bd5b298b08f2":[5,0,0,46,13],
+"include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7":[5,0,0,46,7],
+"include_2network_8php.html#a8122356933bcd6b0a8567e8e15ae5cc5":[5,0,0,46,14],
+"include_2network_8php.html#a897e7112d86eb95526cbd0bff9375f02":[5,0,0,46,12],
+"include_2network_8php.html#a8d5a3afb51cc932032b5dcc159efaae0":[5,0,0,46,6],
+"include_2network_8php.html#a9129fd55e7fc175b4ea9a195cccc16bc":[5,0,0,46,19],
+"include_2network_8php.html#a99353baabbc3e0584b85eb79ee802cff":[5,0,0,46,16],
+"include_2network_8php.html#a9e9da2aafb806c98ecdc318604e60dc6":[5,0,0,46,17],
+"include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37":[5,0,0,46,18],
+"include_2network_8php.html#ab07ce9d75eae559865ed90aad2154bd7":[5,0,0,46,2],
+"include_2network_8php.html#aba38458a2ff2d92d3536488dbb119694":[5,0,0,46,0],
+"include_2network_8php.html#ad4056d3ce69988f5c1a997a79f503246":[5,0,0,46,3],
+"include_2network_8php.html#adf6008b38c555e98e7ed10da9ede2335":[5,0,0,46,15],
+"include_2network_8php.html#ae8d9c41a11000fb8667039fc71b4f73f":[5,0,0,46,11],
+"include_2network_8php.html#aee35d9ad6b3f872bfb39ba3598936aa7":[5,0,0,46,1],
 "include_2notify_8php.html":[5,0,0,48],
 "include_2notify_8php.html#a0e61728e487df50c72e6434f911a57d3":[5,0,0,48,0],
 "include_2oembed_8php.html":[5,0,0,50],
@@ -244,10 +249,5 @@ var NAVTREEINDEX4 =
 "include_2oembed_8php.html#a00c4c80deffd9daf8dc97b58d4c64ed0":[5,0,0,50,7],
 "include_2oembed_8php.html#a03fa3b7832c98a3d0b4630afeb73d487":[5,0,0,50,1],
 "include_2oembed_8php.html#a26bb4c1e330d2f94ea7b6ce2fe970cf3":[5,0,0,50,4],
-"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[5,0,0,50,3],
-"include_2oembed_8php.html#a9e57f3e36a0a0a47e6db79544b701d9a":[5,0,0,50,6],
-"include_2oembed_8php.html#ab953a6e7c11bc6498ce01ed73e2ba319":[5,0,0,50,0],
-"include_2oembed_8php.html#aba89ae64b355efcb4f706553d3edb6a2":[5,0,0,50,2],
-"include_2photos_8php.html":[5,0,0,55],
-"include_2photos_8php.html#a6c40ef58aefef705a5adc84a40e97109":[5,0,0,55,0]
+"include_2oembed_8php.html#a98549b9af8140eda3eceaeedcaabc2c2":[5,0,0,50,3]
 };