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

Conflicts:
	view/php/theme_init.php

1 files changed, 68 insertions, 22 deletions

diff --git a/doc/html/globals_0x70.html b/doc/html/globals_0x70.html
index 661e88771..732be0fe5 100644
--- a/doc/html/globals_0x70.html
+++ b/doc/html/globals_0x70.html
@@ -28,7 +28,7 @@
 <table cellspacing="0" cellpadding="0">
  <tbody>
  <tr style="height: 56px;">
-  <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td>
+  <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td>
   <td style="padding-left: 0.5em;">
    <div id="projectname">The Red Matrix
    </div>
@@ -146,8 +146,6 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 <h3><a class="anchor" id="index_p"></a>- p -</h3><ul>
 <li>page
 : <a class="el" href="mod__import_8php.html#a8db1899eeeb44dabd0904065b63627bb">mod_import.php</a>
-, <a class="el" href="mod__new__channel_8php.html#a8db1899eeeb44dabd0904065b63627bb">mod_new_channel.php</a>
-, <a class="el" href="mod__register_8php.html#a8db1899eeeb44dabd0904065b63627bb">mod_register.php</a>
 </li>
 <li>PAGE_ADULT
 : <a class="el" href="boot_8php.html#ace83842dbeb84f7ed9ac59a9f57a7c32">boot.php</a>
@@ -179,6 +177,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 <li>PAGE_REMOVED
 : <a class="el" href="boot_8php.html#a4edce16cb7f21cdafa1e85bf63d713e6">boot.php</a>
 </li>
+<li>PAGE_SYSTEM
+: <a class="el" href="boot_8php.html#a6ee7a72d558d1851bbb9e3cdde377932">boot.php</a>
+</li>
 <li>pagelist_widget()
 : <a class="el" href="page__widgets_8php.html#ad82011c1ed90d9de8b9f34c12af5c6f0">page_widgets.php</a>
 </li>
@@ -375,7 +376,7 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 : <a class="el" href="language_8php.html#a78bd204955ec4cc3a9ac651285a1689d">language.php</a>
 </li>
 <li>populate_acl()
-: <a class="el" href="acl__selectors_8php.html#a51f2ec7a143d5a5b38e35efd5f3d6e2c">acl_selectors.php</a>
+: <a class="el" href="acl__selectors_8php.html#a7b5446e999636ceceea65c154d865a31">acl_selectors.php</a>
 </li>
 <li>post_activity_item()
 : <a class="el" href="items_8php.html#a410f9c743877c125ca06312373346903">items.php</a>
@@ -386,8 +387,62 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 <li>post_post()
 : <a class="el" href="post_8php.html#af59e6a1dc22d19d9257b01cd7ccedb75">post.php</a>
 </li>
-<li>post_url()
-: <a class="el" href="include_2network_8php.html#aa44d9e33a579d930e9e79c4ebb3d6b5e">network.php</a>
+<li>post_to_red_acct_name
+: <a class="el" href="post__to__red_8php.html#a588cea66afe0b32f27f2713d44940119">post_to_red.php</a>
+</li>
+<li>post_to_red_admin()
+: <a class="el" href="post__to__red_8php.html#aeec4125719184e7b097b3b9fba3101b5">post_to_red.php</a>
+</li>
+<li>post_to_red_deactivate()
+: <a class="el" href="post__to__red_8php.html#a49fd35f7b1cdddfe6e26ddfcf8d3c4ec">post_to_red.php</a>
+</li>
+<li>post_to_red_delete_comment()
+: <a class="el" href="post__to__red_8php.html#a5cc2a89a6d33cdb8e2ca557a69bef42d">post_to_red.php</a>
+</li>
+<li>post_to_red_delete_post()
+: <a class="el" href="post__to__red_8php.html#a4674bb5ce2baa32c559607460c39a2c5">post_to_red.php</a>
+</li>
+<li>post_to_red_display_admin_page()
+: <a class="el" href="post__to__red_8php.html#a8ec8f8809e3c5d1b2c9598c8185d63aa">post_to_red.php</a>
+</li>
+<li>post_to_red_displayAdminContent()
+: <a class="el" href="post__to__red_8php.html#a75db5d87226a0287a0ac0fa315f2bcfd">post_to_red.php</a>
+</li>
+<li>post_to_red_get_acct_name()
+: <a class="el" href="post__to__red_8php.html#ae6f3a2c0561cbeacda5be565b06de8a7">post_to_red.php</a>
+</li>
+<li>post_to_red_get_avatar()
+: <a class="el" href="post__to__red_8php.html#ae0b881461afbdba93d9329068ea52136">post_to_red.php</a>
+</li>
+<li>post_to_red_get_channel_name()
+: <a class="el" href="post__to__red_8php.html#aacba7a0646fc00ae6ac4f5dc383fccab">post_to_red.php</a>
+</li>
+<li>post_to_red_get_password()
+: <a class="el" href="post__to__red_8php.html#a4d90ac085c14f53ff4d8ab4c23477ea6">post_to_red.php</a>
+</li>
+<li>post_to_red_get_seed_location()
+: <a class="el" href="post__to__red_8php.html#a96d0ccecb96600ef1bfd50ab3f77315f">post_to_red.php</a>
+</li>
+<li>post_to_red_path
+: <a class="el" href="post__to__red_8php.html#a6210f39392a5f0fa0255cc7d3760493a">post_to_red.php</a>
+</li>
+<li>post_to_red_post()
+: <a class="el" href="post__to__red_8php.html#af5fd50e2c42ede85f8a9e8d9ee3cf540">post_to_red.php</a>
+</li>
+<li>post_to_red_post_checkbox()
+: <a class="el" href="post__to__red_8php.html#a0f139dea77a94c98f26007963eea639c">post_to_red.php</a>
+</li>
+<li>post_to_red_post_field_data()
+: <a class="el" href="post__to__red_8php.html#a7e68a8d9c83cb28d032aad3ea85ce0a6">post_to_red.php</a>
+</li>
+<li>post_to_red_post_meta_content()
+: <a class="el" href="post__to__red_8php.html#aa97aeda12ef080665f16311a4e1eb901">post_to_red.php</a>
+</li>
+<li>post_to_red_settings_link()
+: <a class="el" href="post__to__red_8php.html#a906be8f72cf1aa2e199c0683ea6a4017">post_to_red.php</a>
+</li>
+<li>post_to_red_version
+: <a class="el" href="post__to__red_8php.html#af3e7ebd361d4ed7cb6d43209970cd94a">post_to_red.php</a>
 </li>
 <li>posted_date_widget()
 : <a class="el" href="items_8php.html#abe695dd89e1e10ed042c26b80114f0ed">items.php</a>
@@ -395,6 +450,9 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 <li>posted_dates()
 : <a class="el" href="items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0">items.php</a>
 </li>
+<li>preg_callback_help_include()
+: <a class="el" href="help_8php.html#a06b2a51aaabed99e53a9b639047c4ce4">help.php</a>
+</li>
 <li>preg_heart()
 : <a class="el" href="text_8php.html#ac19d2b33a58372a357a43d51eed19162">text.php</a>
 </li>
@@ -449,23 +507,17 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 <li>profile_activity()
 : <a class="el" href="activities_8php.html#a80134e807719b3c54aba971958d2e132">activities.php</a>
 </li>
-<li>profile_aside()
-: <a class="el" href="profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e">profile.php</a>
-</li>
 <li>profile_content()
 : <a class="el" href="profile_8php.html#a3775cf6eef6587e5143133356a7b76c0">profile.php</a>
 </li>
 <li>profile_create_sidebar()
-: <a class="el" href="boot_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620">boot.php</a>
+: <a class="el" href="identity_8php.html#ad4a2c8caca8f6ae93633ebeca0ed6620">identity.php</a>
 </li>
 <li>profile_init()
 : <a class="el" href="profile_8php.html#ab5d0246be0552e2182a585c1206d22a5">profile.php</a>
 </li>
 <li>profile_load()
-: <a class="el" href="boot_8php.html#a4751b522ea913d0e7ed43e03d22e9e68">boot.php</a>
-</li>
-<li>profile_photo_aside()
-: <a class="el" href="profile__photo_8php.html#ac9cd968a767e2ae1b88383b6cdd6dbe3">profile_photo.php</a>
+: <a class="el" href="identity_8php.html#a4751b522ea913d0e7ed43e03d22e9e68">identity.php</a>
 </li>
 <li>profile_photo_init()
 : <a class="el" href="profile__photo_8php.html#a140631c56438fbfacb61a1eb43067d02">profile_photo.php</a>
@@ -474,17 +526,14 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 : <a class="el" href="profile__photo_8php.html#a4b80234074bd603221aa5364f330e479">profile_photo.php</a>
 </li>
 <li>profile_sidebar()
-: <a class="el" href="boot_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc">boot.php</a>
+: <a class="el" href="identity_8php.html#a432259b2cf5b6f59be53e71db9f2c7dc">identity.php</a>
 </li>
 <li>profile_tabs()
-: <a class="el" href="boot_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273">boot.php</a>
+: <a class="el" href="conversation_8php.html#a1dfcb5146e9d1eca4528bc580ad5d273">conversation.php</a>
 </li>
 <li>profiler()
 : <a class="el" href="text_8php.html#a8b0a799341b1fc4cba2c3ede3e3fc9b6">text.php</a>
 </li>
-<li>profiles_aside()
-: <a class="el" href="profiles_8php.html#a2a3ac90f51941ff78b85e9389304969c">profiles.php</a>
-</li>
 <li>profiles_content()
 : <a class="el" href="profiles_8php.html#a46975783b8b8d70402d51487eb1f0b00">profiles.php</a>
 </li>
@@ -494,9 +543,6 @@ $(document).ready(function(){initNavTree('globals_0x70.html','');});
 <li>profiles_post()
 : <a class="el" href="profiles_8php.html#ab0362c81b1d3b0b12a772b9fac446e04">profiles.php</a>
 </li>
-<li>profperm_aside()
-: <a class="el" href="profperm_8php.html#a77fd398ae7c25142e1d9ad724ec347cc">profperm.php</a>
-</li>
 <li>profperm_content()
 : <a class="el" href="profperm_8php.html#aef015787de2373d9fb3fe3f814fb5023">profperm.php</a>
 </li>