Merge remote-tracking branch 'upstream/develop' into develop

Signed-off-by: Roland Häder <roland@mxchange.org>
Conflicts:
	mod/proxy.php

diff --cc mod/proxy.php
index af0f9126164a8813a01778027e7851cec90409b2,736b44007f0627d3f36822820de5c1e03ee738c5..bf1e93ccf86f77add9a8fac1f75d04090cb9c2d6
--- 1/mod/proxy.php
--- 2/mod/proxy.php
+++ b/mod/proxy.php
@@@ -321,12 -321,16 +321,16 @@@ function proxy_url($url, $writemode = f
   * @return boolean
   */
  function proxy_is_local_image($url) {
-       if ($url[0] == '/') return true;
+       if ($url[0] == '/') {
+               return true;
+       }
  
-       if (strtolower(substr($url, 0, 5)) == "data:") return true;
+       if (strtolower(substr($url, 0, 5)) == 'data:') {
+               return true;
+       }
  
        // links normalised - bug #431
 -      $baseurl = normalise_link(get_app()->get_baseurl());
 +      $baseurl = normalise_link(App::get_baseurl());
        $url = normalise_link($url);
        return (substr($url, 0, strlen($baseurl)) == $baseurl);
  }
@@@ -365,8 -372,8 +372,7 @@@ function proxy_img_cb($matches) 
  }
  
  function proxy_parse_html($html) {
--      $a = get_app();
-       $html = str_replace(normalise_link(App::get_baseurl())."/", App::get_baseurl()."/", $html);
 -      $html = str_replace(normalise_link($a->get_baseurl()) . '/', $a->get_baseurl() . '/', $html);
++      $html = str_replace(normalise_link(App::get_baseurl()) . '/', App::get_baseurl() . '/', $html);
  
-       return preg_replace_callback("/(<img [^>]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "proxy_img_cb", $html);
+       return preg_replace_callback('/(<img [^>]*src *= *["\'])([^"\']+)(["\'][^>]*>)/siU', 'proxy_img_cb', $html);
  }