From: Georg Ehrke Date: Tue, 24 Apr 2012 18:14:42 +0000 (+0200) Subject: fix linkto function in OC_Helper X-Git-Tag: v4.0.0beta~168^2~28 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=29b9e27078ea2a1ca404a7b7b32de7e7afc52274;p=nextcloud-server.git fix linkto function in OC_Helper --- diff --git a/lib/helper.php b/lib/helper.php index 072a544a40a..e532d5391f9 100755 --- a/lib/helper.php +++ b/lib/helper.php @@ -41,11 +41,15 @@ class OC_Helper { $app .= '/'; // Check if the app is in the app folder if( file_exists( OC::$APPSROOT . '/apps/'. $app.$file )){ - if(substr($app, -1, 1) == '/'){ - $app = substr($app, 0, strlen($app) - 1); + if(substr($file, -3) == 'php'){ + if(substr($app, -1, 1) == '/'){ + $app = substr($app, 0, strlen($app) - 1); + } + $urlLinkTo = OC::$APPSWEBROOT . '/?app=' . $app; + $urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):''; + }else{ + $urlLinkTo = OC::$APPSWEBROOT . '/' . $app . $file; } - $urlLinkTo = OC::$APPSWEBROOT . '/?app=' . $app; - $urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):''; } else{ $urlLinkTo = OC::$WEBROOT . '/' . $app . $file;