rename var file to getfile to prevent fails in files app

diff --git a/core/js/js.js b/core/js/js.js
index 9b0a159b5c2f59694fce499b995a540e9c14799e..4abaced1ae00a16dabe464e716eb4e734f72aefd 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -53,7 +53,7 @@ OC={
                var isCore=OC.coreApps.indexOf(app)!=-1;
                var link=OC.webroot;
                if(file.substring(file.length-3) == 'php' && !isCore){
-                       link+='/?app=' + app + '&file=' + type + '/' + file;
+                       link+='/?app=' + app + '&getfile=' + type + '/' + file;
                }else{
                        link+='/';
                        app+='/';

diff --git a/lib/base.php b/lib/base.php
index df240dca6dfe893152c99cd87102ad67ba8e1e49..4800a426217889005e97579cb87835b09ea9614d 100644 (file)
--- a/lib/base.php
+++ b/lib/base.php
@@ -399,16 +399,16 @@ class OC{
                register_shutdown_function(array('OC_Helper','cleanTmp'));
                
                self::$REQUESTEDAPP = (isset($_GET['app'])?strip_tags($_GET['app']):'files');
-               self::$REQUESTEDFILE = $_GET['file'];
+               self::$REQUESTEDFILE = $_GET['getfile'];
                if(substr_count(self::$REQUESTEDFILE, '?') != 0){
                        $pos_questionmark = strpos(self::$REQUESTEDFILE, '?');
                        $pos_equal = strpos(self::$REQUESTEDFILE, '=');
                        $pos_and = strpos(self::$REQUESTEDFILE, '?');
                        $_GET[substr(self::$REQUESTEDFILE, $pos_questionmark + 1, $pos_equal - $pos_questionmark - 1)] = substr(self::$REQUESTEDFILE, $pos_equal + 1, $pos_and);
                        self::$REQUESTEDFILE = substr(self::$REQUESTEDFILE, 0, $pos_questionmark);
-                       $_GET['file'] = OC::$REQUESTEDFILE;
+                       $_GET['getfile'] = OC::$REQUESTEDFILE;
                }
-               self::$REQUESTEDFILE = (isset($_GET['file'])?(OC_Helper::issubdirectory(OC::$APPSROOT . '/' . self::$REQUESTEDAPP . '/' . self::$REQUESTEDFILE, OC::$APPSROOT . '/' . self::$REQUESTEDAPP)?self::$REQUESTEDFILE:null):null);
+               self::$REQUESTEDFILE = (isset($_GET['getfile'])?(OC_Helper::issubdirectory(OC::$APPSROOT . '/' . self::$REQUESTEDAPP . '/' . self::$REQUESTEDFILE, OC::$APPSROOT . '/' . self::$REQUESTEDAPP)?self::$REQUESTEDFILE:null):null);
        }
 }
 

diff --git a/lib/helper.php b/lib/helper.php
index d68830fe483178b688306511a94668d0f3582002..2067190bca775d2cfc13036614b93adb563fc50a 100755 (executable)
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -45,7 +45,7 @@ class OC_Helper {
                                        $app = substr($app, 0, strlen($app) - 1);
                                }
                                $urlLinkTo =  OC::$APPSWEBROOT . '/?app=' . $app;
-                               $urlLinkTo .= ($file!='index.php')?'&file=' . $file:'';
+                               $urlLinkTo .= ($file!='index.php')?'&getfile=' . $file:'';
                        }
                        else{
                                $urlLinkTo =  OC::$WEBROOT . '/' . $app . $file;