Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CRM-17789 - Support PHP 7 - mysqli support in _civicrm_install_db #384

Merged
merged 1 commit into from
Jul 30, 2016
Merged

CRM-17789 - Support PHP 7 - mysqli support in _civicrm_install_db #384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions drush/civicrm.drush.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,15 +381,15 @@ function _civicrm_install_db($dbuser, $dbpass, $dbhost, $dbname,
$siteRoot = drush_get_context('DRUSH_DRUPAL_SITE_ROOT', FALSE);

$sqlPath = "$modPath/civicrm/sql";
$conn = @mysql_connect($dbhost, $dbuser, $dbpass);
if (!@mysql_select_db($dbname) &&
!@mysql_query("CREATE DATABASE $database")
$conn = @mysqli_connect($dbhost, $dbuser, $dbpass);
if (!@mysqli_select_db($conn, $dbname) &&
!@mysqli_query($conn, "CREATE DATABASE $dbname")
) {
drush_die(dt('CiviCRM database was not found. Failed to create one.'));
}

// setup database with civicrm structure and data
$dsn = "mysql://{$dbuser}:{$dbpass}@{$dbhost}/{$dbname}?new_link=true";
$dsn = "mysqli://{$dbuser}:{$dbpass}@{$dbhost}/{$dbname}?new_link=true";
drush_log(dt("Loading CiviCRM database structure .."));
civicrm_source($dsn, $sqlPath . '/civicrm.mysql');
drush_log(dt("Loading CiviCRM database with required data .."));
Expand Down