Remove redundant code from OC_Helper::linkTo
This commit is contained in:
parent
b2cbf1199d
commit
19bb4e83c9
1 changed files with 3 additions and 6 deletions
|
@ -38,13 +38,10 @@ class OC_Helper {
|
|||
*/
|
||||
public static function linkTo( $app, $file ){
|
||||
if( $app != '' ){
|
||||
$app .= '/';
|
||||
$app_path = OC_App::getAppPath($app);
|
||||
// Check if the app is in the app folder
|
||||
if( file_exists( OC_App::getAppPath($app).'/'.$file )){
|
||||
if( $app_path && file_exists( $app_path.'/'.$file )){
|
||||
if(substr($file, -3) == 'php' || substr($file, -3) == 'css'){
|
||||
if(substr($app, -1, 1) == '/'){
|
||||
$app = substr($app, 0, strlen($app) - 1);
|
||||
}
|
||||
$urlLinkTo = OC::$WEBROOT . '/?app=' . $app;
|
||||
$urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):'';
|
||||
}else{
|
||||
|
@ -52,7 +49,7 @@ class OC_Helper {
|
|||
}
|
||||
}
|
||||
else{
|
||||
$urlLinkTo = OC::$WEBROOT . '/' . $app . $file;
|
||||
$urlLinkTo = OC::$WEBROOT . '/' . $app . '/' . $file;
|
||||
}
|
||||
}
|
||||
else{
|
||||
|
|
Loading…
Reference in a new issue