diff options
author | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
---|---|---|
committer | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
commit | 5cca00ddc79dad667464674e08a2a860e262eabd (patch) | |
tree | 53df980e32a6706e977a5a2276e0f9aa9ec09300 /doc/html/parse__url_8php.html | |
parent | 67166180bb560276273a20bcd9ca2a7aae036aba (diff) | |
parent | a79072ce478a999b06df38ae324fbcef6d3a76e7 (diff) | |
download | volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2 volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/tpl/theme_settings.tpl
reset to upstream
Diffstat (limited to 'doc/html/parse__url_8php.html')
-rw-r--r-- | doc/html/parse__url_8php.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/html/parse__url_8php.html b/doc/html/parse__url_8php.html index 6cf112ea3..be706dad8 100644 --- a/doc/html/parse__url_8php.html +++ b/doc/html/parse__url_8php.html @@ -112,7 +112,7 @@ $(document).ready(function(){initNavTree('parse__url_8php.html','');}); <table class="memberdecls"> <tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="func-members"></a> Functions</h2></td></tr> -<tr class="memitem:a496f4e3836154f6f32b8e805a7160d3a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a">if</a>(!function_exists('<a class="el" href="html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2">deletenode</a>')) </td><td class="memItemRight" valign="bottom"><a class="el" href="parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a">completeurl</a> ($url, $scheme)</td></tr> +<tr class="memitem:a496f4e3836154f6f32b8e805a7160d3a"><td class="memItemLeft" align="right" valign="top"><a class="el" href="apw_2php_2style_8php.html#a2f71e817b8fac88ce7f0ec5c0fb88b8d">if</a>(!function_exists('<a class="el" href="html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2">deletenode</a>')) </td><td class="memItemRight" valign="bottom"><a class="el" href="parse__url_8php.html#a496f4e3836154f6f32b8e805a7160d3a">completeurl</a> ($url, $scheme)</td></tr> <tr class="separator:a496f4e3836154f6f32b8e805a7160d3a"><td class="memSeparator" colspan="2"> </td></tr> <tr class="memitem:a25635549f2c22955d72465f4d2e58993"><td class="memItemLeft" align="right" valign="top"> </td><td class="memItemRight" valign="bottom"><a class="el" href="parse__url_8php.html#a25635549f2c22955d72465f4d2e58993">parseurl_getsiteinfo</a> ($url)</td></tr> <tr class="separator:a25635549f2c22955d72465f4d2e58993"><td class="memSeparator" colspan="2"> </td></tr> @@ -153,7 +153,7 @@ Functions</h2></td></tr> <div class="memproto"> <table class="memname"> <tr> - <td class="memname"><a class="el" href="apw_2php_2style_8php.html#a883f9f14e205f7aa7de02c14df67b40a">if</a> (!function_exists('<a class="el" href="html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2">deletenode</a>')) completeurl </td> + <td class="memname"><a class="el" href="apw_2php_2style_8php.html#a2f71e817b8fac88ce7f0ec5c0fb88b8d">if</a> (!function_exists('<a class="el" href="html2bbcode_8php.html#a71a07f135d196ec5943b13f7b2e6a9b2">deletenode</a>')) completeurl </td> <td>(</td> <td class="paramtype"> </td> <td class="paramname"><em>$url</em>, </td> |