fix 404

diff --git a/.htaccess b/.htaccess
index f2172f4357af0b740232482f5a9aa51ed6fe67c4..c818c9ca2ea595d7e77d036608fa5150ddc5bf55 100644 (file)
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,4 @@
-ErrorDocument 404 //owncloud/templates/404.php
+ErrorDocument 404 //core/templates/404.php
 php_value upload_max_filesize 20M
 php_value post_max_size 20M
 SetEnv htaccessWorking true

diff --git a/core/templates/404.php b/core/templates/404.php
index b287571d166e8b1c5c84cd9ec573730b671024cd..b78828e6301b04222b0fbc3baca4c0db1c1a6957 100644 (file)
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -1,6 +1,6 @@
 <?php
 if(!isset($_)){//also provide standalone error page
-       require_once '../lib/base.php';
+       require_once '../../lib/base.php';
        require( 'template.php' );
        
        $tmpl = new OC_TEMPLATE( '', '404', 'guest' );

diff --git a/lib/files.php b/lib/files.php
index 0e7e44ec2ab001f773e169799cb896895ae78569..d81336679540d323672cbbd7bcc1aebfb25871ac 100644 (file)
--- a/lib/files.php
+++ b/lib/files.php
@@ -293,7 +293,7 @@ class OC_FILES {
                $size=OC_HELPER::humanFileSize($size);
                $size=substr($size,0,-1);//strip the B
                $size=str_replace(' ','',$size); //remove the space between the size and the postfix
-               $content = "ErrorDocument 404 /$WEBROOT/templates/404.php\n";//custom 404 error page
+               $content = "ErrorDocument 404 /$WEBROOT/core/templates/404.php\n";//custom 404 error page
                $content.= "php_value upload_max_filesize $size\n";//upload limit
                $content.= "php_value post_max_size $size\n";
                $content.= "SetEnv htaccessWorking true\n";

diff --git a/lib/setup.php b/lib/setup.php
index a3cefad62b0edd6ef3dc23189d5fbf4eb3e34299..1be4dea286d5a7724eba86f64896ff3432fa5fe0 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -184,7 +184,7 @@ class OC_SETUP {
        private static function createHtaccess() {
                global $SERVERROOT;
                global $WEBROOT;
-               $content = "ErrorDocument 404 /$WEBROOT/templates/404.php\n";//custom 404 error page
+               $content = "ErrorDocument 404 /$WEBROOT/core/templates/404.php\n";//custom 404 error page
                $content.= "php_value upload_max_filesize 20M\n";//upload limit
                $content.= "php_value post_max_size 20M\n";
                $content.= "SetEnv htaccessWorking true\n";