aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-12 11:07:59 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-12 11:07:59 +0000
commitfc7f5ac1455f1297de2122391c4052565bf6b591 (patch)
treea85950c6b7dbaaf6e11be913b226f9827be8ef93
parentc7559da210c9dba080ff5de243240b3be7f2c857 (diff)
downloadelgg-fc7f5ac1455f1297de2122391c4052565bf6b591.tar.gz
elgg-fc7f5ac1455f1297de2122391c4052565bf6b591.tar.bz2
Fixes #2521 - added check for old .htaccess
git-svn-id: http://code.elgg.org/elgg/trunk@7064 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--install/ElggRewriteTester.php5
-rw-r--r--install/languages/en.php1
2 files changed, 6 insertions, 0 deletions
diff --git a/install/ElggRewriteTester.php b/install/ElggRewriteTester.php
index 7f3501059..6a4d5d16d 100644
--- a/install/ElggRewriteTester.php
+++ b/install/ElggRewriteTester.php
@@ -105,6 +105,11 @@ class ElggRewriteTester {
$this->htaccessIssue = 'non_elgg_htaccess';
return FALSE;
} else {
+ // check if this is an old Elgg htaccess
+ if (strpos($data, 'RewriteRule ^rewrite.php$ install.php') == FALSE) {
+ $this->htaccessIssue = 'old_elgg_htaccess';
+ return FALSE;
+ }
return TRUE;
}
}
diff --git a/install/languages/en.php b/install/languages/en.php
index 455515b61..a79b8ebe6 100644
--- a/install/languages/en.php
+++ b/install/languages/en.php
@@ -138,6 +138,7 @@ If you are ready to proceed, click the Next button.",
'install:error:rewrite:htaccess:write_permission' => 'Your web server does not have permission to create the .htaccess file in Elgg\'s directory. You need to manually copy htaccess_dist to .htaccess or change the permissions on the directory.',
'install:error:rewrite:htaccess:read_permission' => 'There is an .htaccess file in Elgg\'s directory, but your web server does not have permission to read it.',
'install:error:rewrite:htaccess:non_elgg_htaccess' => 'There is an .htaccess file in Elgg\'s directory that was not not created by Elgg. Please remove it.',
+ 'install:error:rewrite:htaccess:old_elgg_htaccess' => 'There appears to be an old Elgg .htaccess file in Elgg\'s directory. It does not contain the rewrite rule for testing the web server.',
'install:error:rewrite:htaccess:cannot_copy' => 'A unknown error occurred while creating the .htaccess file. You need to manually copy htaccess_dist to .htaccess in Elgg\'s directory.',
'install:error:rewrite:altserver' => 'The rewrite rules test failed. You need to configure your web server with Elgg\'s rewrite rules and try again.',
'install:error:rewrite:unknown' => 'Oof. We couldn\'t figure out what kind of web server is running on your server and it failed the rewrite rules. We cannot offer any specific advice. Please check the troubleshooting link.',