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

Conflicts:
	view/php/theme_init.php

1 files changed, 3 insertions, 12 deletions

diff --git a/doc/html/boot_8php.js b/doc/html/boot_8php.js
index bbb5596e5..dc2cf6b5b 100644
--- a/doc/html/boot_8php.js
+++ b/doc/html/boot_8php.js
@@ -16,14 +16,9 @@ var boot_8php =
     [ "fix_system_urls", "boot_8php.html#aca5e42678e178c6b9034610d66666fd7", null ],
     [ "get_account_id", "boot_8php.html#afe88b920aa285982edb817a0dd44eb37", null ],
     [ "get_app", "boot_8php.html#a0e6db7e365f2b041a828b93786f694bc", null ],
-    [ "get_birthdays", "boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51", null ],
     [ "get_custom_nav", "boot_8php.html#a899d24fd074594ceebbf72e1feff335f", null ],
-    [ "get_events", "boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312", null ],
     [ "get_max_import_size", "boot_8php.html#a97769915c9f14adc4f8ab1ea2cecfd90", null ],
-    [ "get_my_address", "boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2", null ],
-    [ "get_my_url", "boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec", null ],
     [ "get_observer_hash", "boot_8php.html#a623e49c79943f3e7bdb770d021683cf7", null ],
-    [ "get_theme_uid", "boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3", null ],
     [ "goaway", "boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1", null ],
     [ "head_get_icon", "boot_8php.html#a24a7a70afedd5d85fe0eadc85afa9f77", null ],
     [ "head_set_icon", "boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84", null ],
@@ -36,19 +31,12 @@ var boot_8php =
     [ "login", "boot_8php.html#aefecf8599036df7f1b95d6820e0e2fa4", null ],
     [ "notice", "boot_8php.html#a9255af5ae9c887520091ea04763c1a88", null ],
     [ "proc_run", "boot_8php.html#ab346a2ece14993861f3e4206befa94f0", null ],
-    [ "profile_create_sidebar", "boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620", null ],
-    [ "profile_load", "boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68", null ],
-    [ "profile_sidebar", "boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc", null ],
-    [ "profile_tabs", "boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273", null ],
     [ "remote_user", "boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209", null ],
     [ "startup", "boot_8php.html#aca47505b8732177f52bb2d647eb2741c", null ],
     [ "system_unavailable", "boot_8php.html#ac608a34f3bc180e7724192e0fd31f9b0", null ],
     [ "x", "boot_8php.html#a01353c9abebc3544ea080ac161729632", null ],
-    [ "z_birthday", "boot_8php.html#ab55e545b72ec8c097e052ea7d373491f", null ],
     [ "z_path", "boot_8php.html#aba208673515cbb8a55e5fa4a1da99fda", null ],
     [ "z_root", "boot_8php.html#add517a0958ac684792c62142a3877f81", null ],
-    [ "zid", "boot_8php.html#a5b815330f3d177ab383af37a6c12e532", null ],
-    [ "zid_init", "boot_8php.html#a680fbafc2db023c5b1309e0180e81315", null ],
     [ "ABOOK_FLAG_ARCHIVED", "boot_8php.html#a222395aa223cfbff6166fab0b4e2e1d5", null ],
     [ "ABOOK_FLAG_BLOCKED", "boot_8php.html#a52b599cd13e152ebc80d7e4413683195", null ],
     [ "ABOOK_FLAG_HIDDEN", "boot_8php.html#a34c756469ebed32e2fc987bcde62d382", null ],
@@ -66,6 +54,7 @@ var boot_8php =
     [ "ACCOUNT_REMOVED", "boot_8php.html#ab5ddbe69d3d03acd06e1fb281488cb78", null ],
     [ "ACCOUNT_ROLE_ADMIN", "boot_8php.html#ac8400313df2c831653f9036f71ebd86d", null ],
     [ "ACCOUNT_ROLE_ALLOWCODE", "boot_8php.html#a84f48897059bbd4a8738d7ee4cec6688", null ],
+    [ "ACCOUNT_ROLE_SYSTEM", "boot_8php.html#a7c2eb822d50e1554bf5c32861f36342b", null ],
     [ "ACCOUNT_UNVERIFIED", "boot_8php.html#af3a4271630aabd8be592213f925d6a36", null ],
     [ "ACTIVITY_DISLIKE", "boot_8php.html#a0e57f846e6d47a308feced0f7274f178", null ],
     [ "ACTIVITY_FAVORITE", "boot_8php.html#a3e2ea123d29a72012db1241f96280b0e", null ],
@@ -212,6 +201,7 @@ var boot_8php =
     [ "PAGE_NORMAL", "boot_8php.html#a09532c3f750ae8c4527e63b2b790cbf3", null ],
     [ "PAGE_PREMIUM", "boot_8php.html#ab3920c2f3cd64802c0b7ff625c3b2ea8", null ],
     [ "PAGE_REMOVED", "boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6", null ],
+    [ "PAGE_SYSTEM", "boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932", null ],
     [ "PERMS_A_DELEGATE", "boot_8php.html#a423505ab8dbd8e39d04ae3fe1374102b", null ],
     [ "PERMS_A_REPUBLISH", "boot_8php.html#aae6c941bde5fd6fce07e51dba7326ead", null ],
     [ "PERMS_CONTACTS", "boot_8php.html#ab2d0e8a9b81ee548ef2ce8e4560da2f6", null ],
@@ -275,6 +265,7 @@ var boot_8php =
     [ "XCHAN_FLAGS_HIDDEN", "boot_8php.html#a1af3ed96de14aa0d7891b39cc75b60f2", null ],
     [ "XCHAN_FLAGS_ORPHAN", "boot_8php.html#a1c923b99bf77e4203ae94e5684b6ad0f", null ],
     [ "XCHAN_FLAGS_SELFCENSORED", "boot_8php.html#a5a681a672e007cdc22b43345d71f07c6", null ],
+    [ "XCHAN_FLAGS_SYSTEM", "boot_8php.html#afef254290febac854c85fc698d9483a6", null ],
     [ "ZCURL_TIMEOUT", "boot_8php.html#a3cd42a70c6b3999590e4fd7a1a9096af", null ],
     [ "ZOT_REVISION", "boot_8php.html#a36b31575f992a10b5927b76efba9362e", null ]
 ];
\ No newline at end of file