Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index aff3cf8..4562b97 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -320,15 +320,15 @@
// Set up our default preferences
$prefs = array(
- 'tables' => array(),
- 'ignore' => array(),
- 'filename' => '',
- 'format' => 'gzip', // gzip, zip, txt
- 'add_drop' => TRUE,
- 'add_insert' => TRUE,
- 'newline' => "\n",
- 'foreign_key_checks' => TRUE
- );
+ 'tables' => array(),
+ 'ignore' => array(),
+ 'filename' => '',
+ 'format' => 'gzip', // gzip, zip, txt
+ 'add_drop' => TRUE,
+ 'add_insert' => TRUE,
+ 'newline' => "\n",
+ 'foreign_key_checks' => TRUE
+ );
// Did the user submit any preferences? If so set them....
if (count($params) > 0)
diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php
index f118033..94ef95a 100644
--- a/system/database/drivers/mysql/mysql_utility.php
+++ b/system/database/drivers/mysql/mysql_utility.php
@@ -80,7 +80,7 @@
// Do we need to include a statement to disable foreign key checks?
if ($foreign_key_checks === FALSE)
{
- $output .= "SET foreign_key_checks = 0;".$newline;
+ $output .= 'SET foreign_key_checks = 0;'.$newline;
}
foreach ( (array) $tables as $table)
@@ -191,7 +191,7 @@
// Do we need to include a statement to re-enable foreign key checks?
if ($foreign_key_checks === FALSE)
{
- $output .= "SET foreign_key_checks = 1;".$newline;
+ $output .= 'SET foreign_key_checks = 1;'.$newline;
}
return $output;
diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php
index 2edf38c..f6688bc 100644
--- a/system/database/drivers/mysqli/mysqli_utility.php
+++ b/system/database/drivers/mysqli/mysqli_utility.php
@@ -80,7 +80,7 @@
// Do we need to include a statement to disable foreign key checks?
if ($foreign_key_checks === FALSE)
{
- $output .= "SET foreign_key_checks = 0;".$newline;
+ $output .= 'SET foreign_key_checks = 0;'.$newline;
}
foreach ( (array) $tables as $table)
@@ -191,7 +191,7 @@
// Do we need to include a statement to re-enable foreign key checks?
if ($foreign_key_checks === FALSE)
{
- $output .= "SET foreign_key_checks = 1;".$newline;
+ $output .= 'SET foreign_key_checks = 1;'.$newline;
}
return $output;
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index cc9afc4..5534a1e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -184,7 +184,7 @@
- Added support for passing a custom database object to the loader.
- Modified the class to no longer extend :doc:`Database Forge <database/forge>`, which has been a deprecated behavior for awhile.
- Overall improved support for all of the drivers.
- - Added 'foreign_key_checks' option to MySQL/MySQLi backup, allowing statement to disable/re-enable foreign key checks to be inserted into the backup output.
+ - Added *foreign_key_checks* option to MySQL/MySQLi backup, allowing statement to disable/re-enable foreign key checks to be inserted into the backup output.
- Libraries