Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
6d7f2552
Commit
6d7f2552
authored
Oct 05, 2012
by
catch
Browse files
Issue
#1804650
by Letharion: Stop checking whether PDO is built from PECL or not.
parent
a834496e
Changes
1
Hide whitespace changes
Inline
Side-by-side
core/includes/install.core.inc
View file @
6d7f2552
...
...
@@ -943,7 +943,7 @@ function install_verify_completed_task() {
*/
function
install_verify_database_settings
()
{
global
$databases
;
if
(
!
empty
(
$databases
)
&&
install_verify_pdo
()
)
{
if
(
!
empty
(
$databases
))
{
$database
=
$databases
[
'default'
][
'default'
];
drupal_static_reset
(
'conf_path'
);
$settings_file
=
'./'
.
conf_path
(
FALSE
)
.
'/settings.php'
;
...
...
@@ -955,18 +955,6 @@ function install_verify_database_settings() {
return
FALSE
;
}
/**
* Verifies the PDO library.
*/
function
install_verify_pdo
()
{
// PDO was moved to PHP core in 5.2.0, but the old extension (targeting 5.0
// and 5.1) is still available from PECL, and can still be built without
// errors. To verify that the correct version is in use, we check the
// PDO::ATTR_DEFAULT_FETCH_MODE constant, which is not available in the
// PECL extension.
return
extension_loaded
(
'pdo'
)
&&
defined
(
'PDO::ATTR_DEFAULT_FETCH_MODE'
);
}
/**
* Form constructor for a form to configure and rewrite settings.php.
*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment