Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#99011: FILE_WRITEABLE typofix to FILE_WRITABLE, patch by myself

6.x
Gábor Hojtsy 2007-05-08 22:10:22 +00:00
parent d7681a355f
commit a7845659e8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
install.php
View File

@ -156,23 +156,23 @@ function install_change_settings($profile = 'default', $install_locale = '') {
// The existing database settings are not working, so we need write access // The existing database settings are not working, so we need write access
// to settings.php to change them. // to settings.php to change them.
$writeable = FALSE; $writable = FALSE;
$file = $conf_path; $file = $conf_path;
// Verify the directory exists. // Verify the directory exists.
if (drupal_verify_install_file($conf_path, FILE_EXIST, 'dir')) { if (drupal_verify_install_file($conf_path, FILE_EXIST, 'dir')) {
// Check to see if a settings.php already exists // Check to see if a settings.php already exists
if (drupal_verify_install_file($settings_file, FILE_EXIST)) { if (drupal_verify_install_file($settings_file, FILE_EXIST)) {
// If it does, make sure it is writeable // If it does, make sure it is writable
$writeable = drupal_verify_install_file($settings_file, FILE_READABLE|FILE_WRITEABLE); $writable = drupal_verify_install_file($settings_file, FILE_READABLE|FILE_WRITABLE);
$file = $settings_file; $file = $settings_file;
} }
else { else {
// If not, makes sure the directory is. // If not, makes sure the directory is.
$writeable = drupal_verify_install_file($conf_path, FILE_READABLE|FILE_WRITEABLE, 'dir'); $writable = drupal_verify_install_file($conf_path, FILE_READABLE|FILE_WRITABLE, 'dir');
} }
} }
if (!$writeable) { if (!$writable) {
drupal_set_message(st('The @drupal installer requires write permissions to %file during the installation process.', array('@drupal' => drupal_install_profile_name(), '%file' => $file)), 'error'); drupal_set_message(st('The @drupal installer requires write permissions to %file during the installation process.', array('@drupal' => drupal_install_profile_name(), '%file' => $file)), 'error');
drupal_set_title(st('Drupal database setup')); drupal_set_title(st('Drupal database setup'));