Merge pull request #1 from friendica/master

Red master has been merged

1 files changed, 38 insertions, 3 deletions

diff --git a/doc/html/globals_vars.html b/doc/html/globals_vars.html
index db57ee822..b011d6ece 100644
--- a/doc/html/globals_vars.html
+++ b/doc/html/globals_vars.html
@@ -140,11 +140,15 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 
 <h3><a class="anchor" id="index_0x24"></a>- $ -</h3><ul>
 <li>$a
-: <a class="el" href="typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f">typo.php</a>
+: <a class="el" href="frphotohelper_8php.html#acebf83966ef6d7e5645a6b62ba368f9f">frphotohelper.php</a>
+, <a class="el" href="typo_8php.html#acebf83966ef6d7e5645a6b62ba368f9f">typo.php</a>
 </li>
 <li>$API
 : <a class="el" href="include_2api_8php.html#aeb2e7ad00ea666b4b6dfcf82008194f8">api.php</a>
 </li>
+<li>$args
+: <a class="el" href="frphotohelper_8php.html#a67e94494731d99ed23b123e95175bc10">frphotohelper.php</a>
+</li>
 <li>$arr
 : <a class="el" href="extract_8php.html#a63bb4c41bc532baacf6a4976cfaa0feb">extract.php</a>
 </li>
@@ -154,11 +158,24 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$bodyclass
 : <a class="el" href="theme_2blogga_2php_2default_8php.html#a720581ae288aa09511670563e4205a4a">default.php</a>
 </li>
+<li>$c
+: <a class="el" href="frphotohelper_8php.html#ab73d7f4f2dae233dd561e7fdaab3a77b">frphotohelper.php</a>
+</li>
 <li>$called_api
 : <a class="el" href="include_2api_8php.html#aa62b15a6bbb280e86b98132eb214013d">api.php</a>
 </li>
+<li>$ch
+: <a class="el" href="frphotohelper_8php.html#a696b903bbc5c02914bdd402e91826eca">frphotohelper.php</a>
+</li>
 <li>$channel
-: <a class="el" href="php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864">theme_init.php</a>
+: <a class="el" href="frphotohelper_8php.html#ac162139c764f53cc07f42b09432549ba">frphotohelper.php</a>
+, <a class="el" href="php_2theme__init_8php.html#a54f32c086fe209c99769a4c4047dd864">theme_init.php</a>
+</li>
+<li>$channel_address
+: <a class="el" href="frphotohelper_8php.html#a1ce9aa56ce28b42f5db69d00d4c78972">frphotohelper.php</a>
+</li>
+<li>$cookies
+: <a class="el" href="frphotohelper_8php.html#aef9f7eafd54f6e36423347bed723c67e">frphotohelper.php</a>
 </li>
 <li>$dir
 : <a class="el" href="docblox__errorchecker_8php.html#a1659f0a629d408e0f849dbe4ee061e62">docblox_errorchecker.php</a>
@@ -186,6 +203,9 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$fname
 : <a class="el" href="apw_2php_2style_8php.html#ab9e0f70d44ab67f4334f9883631777fc">style.php</a>
 </li>
+<li>$fr_server
+: <a class="el" href="frphotohelper_8php.html#a2059b37bbca58d2613c70af2c19eddce">frphotohelper.php</a>
+</li>
 <li>$gc_probability
 : <a class="el" href="session_8php.html#a96b09cc763572f45280786a7b33feb7e">session.php</a>
 </li>
@@ -193,7 +213,7 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 : <a class="el" href="theme_2blogga_2php_2default_8php.html#ac7062908d1eb80c0735270f7997c4527">default.php</a>
 </li>
 <li>$headimghome
-: <a class="el" href="theme_2blogga_2php_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3">default.php</a>
+: <a class="el" href="theme_2blogga_2view_2theme_2blog_2default_8php.html#a1230ab83d4ec9785d8f3a966f33dc5f3">default.php</a>
 </li>
 <li>$i
 : <a class="el" href="docblox__errorchecker_8php.html#a83018d9153d17d91fbcf3bc10158d34f">docblox_errorchecker.php</a>
@@ -213,6 +233,9 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$itemfloat
 : <a class="el" href="minimalisticdarkness_8php.html#a7e6c3d4efde4e9a2de32308081372c6b">minimalisticdarkness.php</a>
 </li>
+<li>$j
+: <a class="el" href="frphotohelper_8php.html#a6f16db779ef3ccea921b277b5dc245d1">frphotohelper.php</a>
+</li>
 <li>$k
 : <a class="el" href="php2po_8php.html#ad6726cfaa85d4b8299d2b0f034cbf178">php2po.php</a>
 </li>
@@ -234,6 +257,12 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$out
 : <a class="el" href="php2po_8php.html#a48cb304902320d173a4eaa41543327b9">php2po.php</a>
 </li>
+<li>$output
+: <a class="el" href="frphotohelper_8php.html#a73004ce9cd673c1bfafd1dc351134797">frphotohelper.php</a>
+</li>
+<li>$photo_id
+: <a class="el" href="frphotohelper_8php.html#a2d2299040f635cee8d5aac68230dd630">frphotohelper.php</a>
+</li>
 <li>$phpath
 : <a class="el" href="typo_8php.html#a3ecd17ac846be1b35f3662f5c12ab6bd">typo.php</a>
 </li>
@@ -249,9 +278,15 @@ $(document).ready(function(){initNavTree('globals_vars.html','');});
 <li>$pofile
 : <a class="el" href="php2po_8php.html#a401d84ce156e49e8168bd0c4781e1be1">php2po.php</a>
 </li>
+<li>$r
+: <a class="el" href="frphotohelper_8php.html#a8abe176bc41afd728f32ba8c506cbd98">frphotohelper.php</a>
+</li>
 <li>$res
 : <a class="el" href="docblox__errorchecker_8php.html#a49a8a4009b02e49717caa88b128affc5">docblox_errorchecker.php</a>
 </li>
+<li>$ret
+: <a class="el" href="frphotohelper_8php.html#a83d5f232bed56a5af8173818b0bdf79d">frphotohelper.php</a>
+</li>
 <li>$s
 : <a class="el" href="extract_8php.html#a50b05cf2e02ef0b67fcad97106dd7634">extract.php</a>
 </li>