aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-20 22:43:59 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-20 22:43:59 +0000
commit2ef1666749b9621820531e65edc84ac0b19e8fa8 (patch)
treef8892b9a951e591f327726d2358022132401e683
parentee8c54c3f564288798c6baec26b2b4e0ff327f78 (diff)
downloadelgg-2ef1666749b9621820531e65edc84ac0b19e8fa8.tar.gz
elgg-2ef1666749b9621820531e65edc84ac0b19e8fa8.tar.bz2
Fixes #3062 checks if data directory exists
git-svn-id: http://code.elgg.org/elgg/trunk@8791 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--install/ElggInstaller.php7
-rw-r--r--install/languages/en.php1
2 files changed, 8 insertions, 0 deletions
diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 900ab6fb0..a09657f7e 100644
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -1258,6 +1258,13 @@ class ElggInstaller {
}
// check that data root is writable
+ if (!file_exists($submissionVars['dataroot'])) {
+ $msg = elgg_echo('install:error:datadirectoryexists', array($submissionVars['dataroot']));
+ register_error($msg);
+ return FALSE;
+ }
+
+ // check that data root is writable
if (!is_writable($submissionVars['dataroot'])) {
$msg = elgg_echo('install:error:writedatadirectory', array($submissionVars['dataroot']));
register_error($msg);
diff --git a/install/languages/en.php b/install/languages/en.php
index 73a862cd0..80716069d 100644
--- a/install/languages/en.php
+++ b/install/languages/en.php
@@ -126,6 +126,7 @@ If you are ready to proceed, click the Next button.",
'install:error:readsettingsphp' => 'Unable to read engine/settings.example.php',
'install:error:writesettingphp' => 'Unable to write engine/settings.php',
'install:error:requiredfield' => '%s is required',
+ 'install:error:datadirectoryexists' => 'Your data directory %s does not exist.',
'install:error:writedatadirectory' => 'Your data directory %s is not writable by the web server.',
'install:error:locationdatadirectory' => 'Your data directory %s must be outside of your install path for security.',
'install:error:emailaddress' => '%s is not a valid email address',