diff options
author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
---|---|---|
committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
commit | 870df76463a1cc9823b364db0bfb387f3f46664f (patch) | |
tree | a8c7391bfe799703aa0a8f26b9ee788f1204e8be /doc/html/profile_8php.html | |
parent | 25a533bd72c34e9775af71c010a39db6caf7b633 (diff) | |
parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
download | volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2 volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip |
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
view/php/theme_init.php
Diffstat (limited to 'doc/html/profile_8php.html')
-rw-r--r-- | doc/html/profile_8php.html | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/doc/html/profile_8php.html b/doc/html/profile_8php.html index eb5e74417..4e95ad2b8 100644 --- a/doc/html/profile_8php.html +++ b/doc/html/profile_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> @@ -114,28 +114,10 @@ $(document).ready(function(){initNavTree('profile_8php.html','');}); Functions</h2></td></tr> <tr class="memitem:ab5d0246be0552e2182a585c1206d22a5"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="profile_8php.html#ab5d0246be0552e2182a585c1206d22a5">profile_init</a> (&$a)</td></tr> <tr class="separator:ab5d0246be0552e2182a585c1206d22a5"><td class="memSeparator" colspan="2"> </td></tr> -<tr class="memitem:a1a2482b775476f2f64ea5e8f4fc3fd1e"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="profile_8php.html#a1a2482b775476f2f64ea5e8f4fc3fd1e">profile_aside</a> (&$a)</td></tr> -<tr class="separator:a1a2482b775476f2f64ea5e8f4fc3fd1e"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:a3775cf6eef6587e5143133356a7b76c0"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="profile_8php.html#a3775cf6eef6587e5143133356a7b76c0">profile_content</a> (&$a, $update=0)</td></tr> <tr class="separator:a3775cf6eef6587e5143133356a7b76c0"><td class="memSeparator" colspan="2"> </td></tr> </table> <h2 class="groupheader">Function Documentation</h2> -<a class="anchor" id="a1a2482b775476f2f64ea5e8f4fc3fd1e"></a> -<div class="memitem"> -<div class="memproto"> - <table class="memname"> - <tr> - <td class="memname">profile_aside </td> - <td>(</td> - <td class="paramtype">& </td> - <td class="paramname"><em>$a</em></td><td>)</td> - <td></td> - </tr> - </table> -</div><div class="memdoc"> - -</div> -</div> <a class="anchor" id="a3775cf6eef6587e5143133356a7b76c0"></a> <div class="memitem"> <div class="memproto"> |