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

Conflicts:
	view/php/theme_init.php

1 files changed, 101 insertions, 3 deletions

diff --git a/doc/html/redbasic_2php_2style_8php.html b/doc/html/redbasic_2php_2style_8php.html
index 9a7c7502e..e816fa304 100644
--- a/doc/html/redbasic_2php_2style_8php.html
+++ b/doc/html/redbasic_2php_2style_8php.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>
@@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('redbasic_2php_2style_8php.html','');})
 <table class="memberdecls">
 <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="var-members"></a>
 Variables</h2></td></tr>
-<tr class="memitem:a109bbd7f4add27541707b191b73ef84a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a">$uid</a> = <a class="el" href="boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3">get_theme_uid</a>()</td></tr>
+<tr class="memitem:a109bbd7f4add27541707b191b73ef84a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a">$uid</a> = <a class="el" href="identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3">get_theme_uid</a>()</td></tr>
 <tr class="separator:a109bbd7f4add27541707b191b73ef84a"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a883f9f14e205f7aa7de02c14df67b40a"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a">if</a> ($uid) <a class="el" href="include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6">load_pconfig</a>($uid</td></tr>
 <tr class="separator:a883f9f14e205f7aa7de02c14df67b40a"><td class="memSeparator" colspan="2">&#160;</td></tr>
@@ -134,6 +134,8 @@ Variables</h2></td></tr>
 <tr class="separator:a27cb59bbc750341f448cd0c298a7ea16"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a136b0a2cdeb37f3fa506d28f82dcdbf8"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a136b0a2cdeb37f3fa506d28f82dcdbf8">$item_opacity</a> = <a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid, &quot;redbasic&quot;, &quot;item_opacity&quot;)</td></tr>
 <tr class="separator:a136b0a2cdeb37f3fa506d28f82dcdbf8"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ad78cb8a1793834626d73aca22a1501f8"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#ad78cb8a1793834626d73aca22a1501f8">$body_font_size</a> = <a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid, &quot;redbasic&quot;, &quot;body_font_size&quot;)</td></tr>
+<tr class="separator:ad78cb8a1793834626d73aca22a1501f8"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:afcbcf57d0b90d2e4226c2e8a1171befc"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#afcbcf57d0b90d2e4226c2e8a1171befc">$font_size</a> = <a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid, &quot;redbasic&quot;, &quot;font_size&quot;)</td></tr>
 <tr class="separator:afcbcf57d0b90d2e4226c2e8a1171befc"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a68e3ff836ec87ae1370c9f4a12c21c6b"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a68e3ff836ec87ae1370c9f4a12c21c6b">$font_colour</a> = <a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid, &quot;redbasic&quot;, &quot;font_colour&quot;)</td></tr>
@@ -148,6 +150,18 @@ Variables</h2></td></tr>
 <tr class="separator:ab5ec5703848e0132f8a8f3d3a53a58e1"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a6ffadaf926b41ad84c30da319011e9ad"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a6ffadaf926b41ad84c30da319011e9ad">$sloppy_photos</a> =<a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid,'redbasic','sloppy_photos')</td></tr>
 <tr class="separator:a6ffadaf926b41ad84c30da319011e9ad"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a810142b4bdd35a1d377ab279b02b47eb"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a810142b4bdd35a1d377ab279b02b47eb">$top_photo</a> =<a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid,'redbasic','top_photo')</td></tr>
+<tr class="separator:a810142b4bdd35a1d377ab279b02b47eb"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a0b070f2c9140a7a12a0b1f88601a29e4"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a0b070f2c9140a7a12a0b1f88601a29e4">$reply_photo</a> =<a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid,'redbasic','reply_photo')</td></tr>
+<tr class="separator:a0b070f2c9140a7a12a0b1f88601a29e4"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:ac98bd8264411bd207a5740d08e81a158"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#ac98bd8264411bd207a5740d08e81a158">$pmenu_top</a> = intval($top_photo) - 16 . 'px'</td></tr>
+<tr class="separator:ac98bd8264411bd207a5740d08e81a158"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a61891d0d3e6894f52410d507b04e565d"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d">$wwtop</a> = intval($top_photo) - 15 . 'px'</td></tr>
+<tr class="separator:a61891d0d3e6894f52410d507b04e565d"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a5bff5012c56e34da6b3b2ed475726b27"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a5bff5012c56e34da6b3b2ed475726b27">$comment_indent</a> = intval($top_photo) + 10 . 'px'</td></tr>
+<tr class="separator:a5bff5012c56e34da6b3b2ed475726b27"><td class="memSeparator" colspan="2">&#160;</td></tr>
+<tr class="memitem:a9b489f1c595b867212d30eca0c85b38c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a9b489f1c595b867212d30eca0c85b38c">$pmenu_reply</a> = intval($reply_photo) - 16 . 'px'</td></tr>
+<tr class="separator:a9b489f1c595b867212d30eca0c85b38c"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:ab3afb90d611eca90819f597a2c0bb459"><td class="memItemLeft" align="right" valign="top"><a class="el" href="redbasic_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a">if</a>($nav_min_opacity===false||$nav_min_opacity=== '')&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#ab3afb90d611eca90819f597a2c0bb459">else</a></td></tr>
 <tr class="separator:ab3afb90d611eca90819f597a2c0bb459"><td class="memSeparator" colspan="2">&#160;</td></tr>
 <tr class="memitem:a01c151bf47f7da2b979aaa4cb868da4c"><td class="memItemLeft" align="right" valign="top">&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c">$nav_percent_min_opacity</a> = (int) 100 * $nav_min_opacity</td></tr>
@@ -192,6 +206,30 @@ Variables</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="ad78cb8a1793834626d73aca22a1501f8"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">$body_font_size = <a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid, &quot;redbasic&quot;, &quot;body_font_size&quot;)</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a5bff5012c56e34da6b3b2ed475726b27"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">$comment_indent = intval($top_photo) + 10 . 'px'</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
 <a class="anchor" id="a0cb037986e32302685d4f580dedd6473"></a>
 <div class="memitem">
 <div class="memproto">
@@ -294,6 +332,30 @@ Variables</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="a9b489f1c595b867212d30eca0c85b38c"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">$pmenu_reply = intval($reply_photo) - 16 . 'px'</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="ac98bd8264411bd207a5740d08e81a158"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">$pmenu_top = intval($top_photo) - 16 . 'px'</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
 <a class="anchor" id="a6502bedd57105ad1fb2dee2be9cf6351"></a>
 <div class="memitem">
 <div class="memproto">
@@ -308,6 +370,18 @@ Variables</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="a0b070f2c9140a7a12a0b1f88601a29e4"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">$reply_photo =<a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid,'redbasic','reply_photo')</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
 <a class="anchor" id="a83022b1d70799d2bde3d64dca9cb40ee"></a>
 <div class="memitem">
 <div class="memproto">
@@ -370,12 +444,36 @@ Variables</h2></td></tr>
 
 </div>
 </div>
+<a class="anchor" id="a810142b4bdd35a1d377ab279b02b47eb"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">$top_photo =<a class="el" href="include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad">get_pconfig</a>($uid,'redbasic','top_photo')</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
 <a class="anchor" id="a109bbd7f4add27541707b191b73ef84a"></a>
 <div class="memitem">
 <div class="memproto">
       <table class="memname">
         <tr>
-          <td class="memname">$uid = <a class="el" href="boot_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3">get_theme_uid</a>()</td>
+          <td class="memname">$uid = <a class="el" href="identity_8php.html#aaeb666872995e3ab8da8f7bc5f3b2bd3">get_theme_uid</a>()</td>
+        </tr>
+      </table>
+</div><div class="memdoc">
+
+</div>
+</div>
+<a class="anchor" id="a61891d0d3e6894f52410d507b04e565d"></a>
+<div class="memitem">
+<div class="memproto">
+      <table class="memname">
+        <tr>
+          <td class="memname">$wwtop = intval($top_photo) - 15 . 'px'</td>
         </tr>
       </table>
 </div><div class="memdoc">