From: Kamil Domanski <kdomanski@kdemail.net>
Date: Thu, 23 Jun 2011 21:47:46 +0000 (+0200)
Subject: fix 404
X-Git-Tag: v3.0~267^2~452
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2073d3b08e97675a1f418b44a4e7c72039da2149;p=nextcloud-server.git

fix 404
---

diff --git a/.htaccess b/.htaccess
index f2172f4357a..c818c9ca2ea 100644
--- 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 b287571d166..b78828e6301 100644
--- 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 0e7e44ec2ab..d8133667954 100644
--- 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 a3cefad62b0..1be4dea286d 100644
--- 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";