diff options
| author | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-29 15:09:35 -0800 |
| commit | 912be23e1627211fb417c4b7bced414cbbe38ef0 (patch) | |
| tree | 2b8567d800624167b3eadf37c8855deb0ba74b0b /doc/html/redstrap_2php_2style_8php.html | |
| parent | ff68ea608786a698ad46637ef13854ac1b1e6beb (diff) | |
| parent | 872b165eb2bb5d632a12f2d7e1a28e195c2d5348 (diff) | |
| download | volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.gz volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.tar.bz2 volse-hubzilla-912be23e1627211fb417c4b7bced414cbbe38ef0.zip | |
Merge branch 'master' into tres
Conflicts:
include/group.php
include/text.php
mod/acl.php
mod/channel.php
mod/connections.php
mod/display.php
mod/group.php
mod/item.php
mod/locs.php
mod/network.php
mod/photos.php
mod/ping.php
mod/starred.php
mod/viewsrc.php
Diffstat (limited to 'doc/html/redstrap_2php_2style_8php.html')
| -rw-r--r-- | doc/html/redstrap_2php_2style_8php.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/html/redstrap_2php_2style_8php.html b/doc/html/redstrap_2php_2style_8php.html index 2642f697d..997721e19 100644 --- a/doc/html/redstrap_2php_2style_8php.html +++ b/doc/html/redstrap_2php_2style_8php.html @@ -144,7 +144,7 @@ Variables</h2></td></tr> <tr class="separator:a45e6fafa363bc4586fa91dce1786be4f"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:a02d39b683a42fffbb27823d3860283bd"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="redstrap_2php_2style_8php.html#a02d39b683a42fffbb27823d3860283bd">$site_colour</a> = <a class="el" href="include_2config_8php.html#af02c96e6b37335774b548914ede1d22e">get_config</a>("redbasic", "colour" )</td></tr> <tr class="separator:a02d39b683a42fffbb27823d3860283bd"><td class="memSeparator" colspan="2"> </td></tr> -<tr class="memitem:a0c4684da834439885ae2285649d1aaea"><td class="memItemLeft" align="right" valign="top">if(<a class="el" href="boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44">local_user</a>()) if($line_height===false) <br class="typebreak"/> +<tr class="memitem:a0c4684da834439885ae2285649d1aaea"><td class="memItemLeft" align="right" valign="top">if(<a class="el" href="boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44">local_channel</a>()) if($line_height===false) <br class="typebreak"/> if($line_height===false) if($redbasic_font_size===false) <br class="typebreak"/> if($redbasic_font_size===false) <br class="typebreak"/> if($colour===false) if($colour===false) <br class="typebreak"/> @@ -365,7 +365,7 @@ if($navcolour==="black") </td><td class="memItemRight" valign="bo <div class="memproto"> <table class="memname"> <tr> - <td class="memname">if (<a class="el" href="boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44">local_user</a>()) if ($line_height===false) if ($line_height===false) if ($redbasic_font_size===false) if ($redbasic_font_size===false) if ($colour===false) if ($colour===false) if ($navcolour==="black") if(file_exists('view/theme/'.<a class="el" href="boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13">current_theme</a>(). '/css/style.css'))</td> + <td class="memname">if (<a class="el" href="boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44">local_channel</a>()) if ($line_height===false) if ($line_height===false) if ($redbasic_font_size===false) if ($redbasic_font_size===false) if ($colour===false) if ($colour===false) if ($navcolour==="black") if(file_exists('view/theme/'.<a class="el" href="boot_8php.html#ad206598b909e8eb67eb0e0bb5ef69c13">current_theme</a>(). '/css/style.css'))</td> </tr> </table> </div><div class="memdoc"> |