summaryrefslogtreecommitdiff
path: root/includes/database
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2009-07-28 12:13:47 +0000
committerDries Buytaert <dries@buytaert.net>2009-07-28 12:13:47 +0000
commitaab51b93194701c45e32e63be31a979c9d9754aa (patch)
treec10b982d45fdfbc8ec711fbf256d2206c6a5f853 /includes/database
parent1115fba0649997f77a70eb4d03b1e4ab1df2d56e (diff)
downloadbrdo-aab51b93194701c45e32e63be31a979c9d9754aa.tar.gz
brdo-aab51b93194701c45e32e63be31a979c9d9754aa.tar.bz2
- Patch #524728 by David_Rothstein, JoshuaRogers, JacobSingh et al: refactor install.php to allow Drupal to be installed from the command line.
Diffstat (limited to 'includes/database')
-rw-r--r--includes/database/database.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/database/database.inc b/includes/database/database.inc
index ce470789a..e27aed807 100644
--- a/includes/database/database.inc
+++ b/includes/database/database.inc
@@ -2509,7 +2509,7 @@ function db_result(DatabaseStatementInterface $statement) {
*/
function _db_check_install_needed() {
global $databases;
- if (empty($databases) && !function_exists('install_main')) {
+ if (empty($databases) && !drupal_installation_attempted()) {
include_once DRUPAL_ROOT . '/includes/install.inc';
install_goto('install.php');
}