Merge remote-tracking branch 'upstream/master'

Conflicts:
	view/theme/redbasic/tpl/theme_settings.tpl

reset to upstream

1 files changed, 29 insertions, 2 deletions

diff --git a/doc/html/globals_vars.html b/doc/html/globals_vars.html
index e2ba25cd8..5e3294c86 100644
--- a/doc/html/globals_vars.html
+++ b/doc/html/globals_vars.html
@@ -172,13 +172,19 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$dirstack
 : <a class="el" href="docblox__errorchecker_8php.html#ab66bc0493d25f39bf8b4dcbb429f04e6">docblox_errorchecker.php</a>
 </li>
+<li>$fext
+: <a class="el" href="apw_2php_2style_8php.html#a404171b8f918c116e45a6421c92f0cc9">style.php</a>
+</li>
 <li>$filelist
 : <a class="el" href="docblox__errorchecker_8php.html#a648a570b0f9f6e0e51b7267647c4b09b">docblox_errorchecker.php</a>
 </li>
 <li>$files
-: <a class="el" href="typo_8php.html#a9590b15215a21e9b42eb546aeef79704">typo.php</a>
-, <a class="el" href="extract_8php.html#a9590b15215a21e9b42eb546aeef79704">extract.php</a>
+: <a class="el" href="extract_8php.html#a9590b15215a21e9b42eb546aeef79704">extract.php</a>
 , <a class="el" href="tpldebug_8php.html#a5358407d65f2ca826f96356a6642d149">tpldebug.php</a>
+, <a class="el" href="typo_8php.html#a9590b15215a21e9b42eb546aeef79704">typo.php</a>
+</li>
+<li>$fname
+: <a class="el" href="apw_2php_2style_8php.html#ab9e0f70d44ab67f4334f9883631777fc">style.php</a>
 </li>
 <li>$gc_probability
 : <a class="el" href="session_8php.html#a96b09cc763572f45280786a7b33feb7e">session.php</a>
@@ -192,6 +198,9 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$i
 : <a class="el" href="docblox__errorchecker_8php.html#a83018d9153d17d91fbcf3bc10158d34f">docblox_errorchecker.php</a>
 </li>
+<li>$iconsize
+: <a class="el" href="apw_2php_2style_8php.html#a07adb491994deb72a00a975b431d3e30">style.php</a>
+</li>
 <li>$infile
 : <a class="el" href="php2po_8php.html#a61f8ddeb5557d46ebc546cc355bda214">php2po.php</a>
 </li>
@@ -213,9 +222,15 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$nav_percent_min_opacity
 : <a class="el" href="redbasic_2php_2style_8php.html#a01c151bf47f7da2b979aaa4cb868da4c">style.php</a>
 </li>
+<li>$navheight
+: <a class="el" href="apw_2php_2style_8php.html#a1c8a7c0db8c174239f3909cb931cb872">style.php</a>
+</li>
 <li>$needed
 : <a class="el" href="docblox__errorchecker_8php.html#a852004caba0a34390297a079f4aaac73">docblox_errorchecker.php</a>
 </li>
+<li>$obliquemacro
+: <a class="el" href="apw_2php_2style_8php.html#a2cad82a3ecadbe58dbc4197de1c63da0">style.php</a>
+</li>
 <li>$out
 : <a class="el" href="php2po_8php.html#a48cb304902320d173a4eaa41543327b9">php2po.php</a>
 </li>
@@ -249,6 +264,9 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$sectionleft
 : <a class="el" href="minimalisticdarkness_8php.html#a0ac3f5b52212b0af87d513273da03ead">minimalisticdarkness.php</a>
 </li>
+<li>$sectiontop
+: <a class="el" href="apw_2php_2style_8php.html#acb0dedc3212a7c60ab2474768becd79a">style.php</a>
+</li>
 <li>$sectionwidth
 : <a class="el" href="minimalisticdarkness_8php.html#a04de7b747e4f0a353e0e38cf77c3404f">minimalisticdarkness.php</a>
 </li>
@@ -258,9 +276,15 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$session_expire
 : <a class="el" href="session_8php.html#af0100a2642a5268594bbd5742a03d885">session.php</a>
 </li>
+<li>$showlock
+: <a class="el" href="apw_2php_2style_8php.html#ad401ea1d1ba236f86863b4574f01e425">style.php</a>
+</li>
 <li>$str
 : <a class="el" href="typohelper_8php.html#a7542d95618011800c61773127fa625cf">typohelper.php</a>
 </li>
+<li>$strongmacro
+: <a class="el" href="apw_2php_2style_8php.html#aa58104ba36588bbf082cecbb3910e2ea">style.php</a>
+</li>
 <li>$uid
 : <a class="el" href="apw_2php_2style_8php.html#a109bbd7f4add27541707b191b73ef84a">style.php</a>
 </li>
@@ -270,6 +294,9 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$wwtop
 : <a class="el" href="redbasic_2php_2style_8php.html#a61891d0d3e6894f52410d507b04e565d">style.php</a>
 </li>
+<li>$x
+: <a class="el" href="apw_2php_2style_8php.html#af3a16c5f0dd7a74cf9acf6a49fff73a7">style.php</a>
+</li>
 <li>$zones
 : <a class="el" href="extract_8php.html#a0cbe524ffc9a496114fd7ba9f423ef44">extract.php</a>
 </li>