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

Conflicts:
	view/php/theme_init.php

1 files changed, 11 insertions, 11 deletions

diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html
index 9797611b1..916f6809c 100644
--- a/doc/html/globals_0x67.html
+++ b/doc/html/globals_0x67.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>
@@ -169,7 +169,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 : <a class="el" href="language_8php.html#a980dee1d8715a98ab02e36b59facf8ed">language.php</a>
 </li>
 <li>get_birthdays()
-: <a class="el" href="boot_8php.html#ad2c97627a313d53df1a1c7b4215ddb51">boot.php</a>
+: <a class="el" href="identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51">identity.php</a>
 </li>
 <li>get_browser_language()
 : <a class="el" href="language_8php.html#ace67d6cad57da08d030ad9dc9b8c836e">language.php</a>
@@ -189,11 +189,14 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 <li>get_db_errno()
 : <a class="el" href="setup_8php.html#a8652788e8589778c5f81634a9d5b9429">setup.php</a>
 </li>
+<li>get_default_profile_photo()
+: <a class="el" href="identity_8php.html#ab1485a26b032956e1496fc08c58b83ed">identity.php</a>
+</li>
 <li>get_dim()
 : <a class="el" href="datetime_8php.html#a7df24d72ea05922d3127363e2295174c">datetime.php</a>
 </li>
 <li>get_events()
-: <a class="el" href="boot_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312">boot.php</a>
+: <a class="el" href="identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312">identity.php</a>
 </li>
 <li>get_features()
 : <a class="el" href="features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c">features.php</a>
@@ -235,10 +238,10 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 : <a class="el" href="text_8php.html#a736db13a966b8abaf8c9198faa35911a">text.php</a>
 </li>
 <li>get_my_address()
-: <a class="el" href="boot_8php.html#a490972c02fdb638c52ec0e012a30bfd2">boot.php</a>
+: <a class="el" href="identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2">identity.php</a>
 </li>
 <li>get_my_url()
-: <a class="el" href="boot_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec">boot.php</a>
+: <a class="el" href="identity_8php.html#aa46321e1cd6a3b8dfde8bf9510112fec">identity.php</a>
 </li>
 <li>get_observer_hash()
 : <a class="el" href="boot_8php.html#a623e49c79943f3e7bdb770d021683cf7">boot.php</a>
@@ -286,7 +289,7 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 : <a class="el" href="plugin_8php.html#a48047edfbef770125a5508dcc2f9282f">plugin.php</a>
 </li>
 <li>get_theme_uid()
-: <a class="el" href="boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3">boot.php</a>
+: <a class="el" href="identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3">identity.php</a>
 </li>
 <li>get_xconfig()
 : <a class="el" href="include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e">config.php</a>
@@ -312,9 +315,6 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 <li>group_add_member()
 : <a class="el" href="include_2group_8php.html#a0122ef312df2c5546b1a46b3e6c7b31b">group.php</a>
 </li>
-<li>group_aside()
-: <a class="el" href="mod_2group_8php.html#aeb0784dd928e53e6d8693513bec8928c">group.php</a>
-</li>
 <li>group_byname()
 : <a class="el" href="include_2group_8php.html#abd66a5ea34a07a3422dc2dde6c7b3ecb">group.php</a>
 </li>
@@ -340,13 +340,13 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
 : <a class="el" href="acl__selectors_8php.html#aa1e3bc344ca2b29f97eb9860216d21a0">acl_selectors.php</a>
 </li>
 <li>group_side()
-: <a class="el" href="include_2group_8php.html#a1042d74055bafe54a6a30103d87a7f17">group.php</a>
+: <a class="el" href="include_2group_8php.html#a6a69bd7be032fa8ce4e49c43a42cc6e9">group.php</a>
 </li>
 <li>groups_containing()
 : <a class="el" href="include_2group_8php.html#afb802ae2ce73aae4bc36d157f7b6a92f">group.php</a>
 </li>
 <li>guess_image_type()
-: <a class="el" href="photo__driver_8php.html#a7273b82b017fd96d29b2c57bab03aea6">photo_driver.php</a>
+: <a class="el" href="photo__driver_8php.html#a243cee492ce443afb6a7d77d54b6c4aa">photo_driver.php</a>
 </li>
 </ul>
 </div><!-- contents -->