projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated Drupal to 8.6. This goes with the following updates because it's possible...
[yaffs-website]
/
vendor
/
drush
/
drush
/
src
/
Sql
/
SqlBase.php
diff --git
a/vendor/drush/drush/src/Sql/SqlBase.php
b/vendor/drush/drush/src/Sql/SqlBase.php
index e1a8455e2d8cc7d21e6eef0392e89f90de8bae70..88e5cb49a8f22656b24e0941e4191d2a16fcef65 100644
(file)
--- a/
vendor/drush/drush/src/Sql/SqlBase.php
+++ b/
vendor/drush/drush/src/Sql/SqlBase.php
@@
-19,7
+19,7
@@
class SqlBase implements ConfigAwareInterface
// An Drupal style array containing specs for connecting to database.
public $dbSpec;
// An Drupal style array containing specs for connecting to database.
public $dbSpec;
- // Default code appended to sql
-query
connections.
+ // Default code appended to sql connections.
public $queryExtra = '';
// The way you pass a sql file when issueing a query.
public $queryExtra = '';
// The way you pass a sql file when issueing a query.
@@
-493,7
+493,7
@@
class SqlBase implements ConfigAwareInterface
public function getOption($name, $default = null)
{
$options = $this->getOptions();
public function getOption($name, $default = null)
{
$options = $this->getOptions();
- return array_key_exists($name, $options) ? $options[$name] : $default;
+ return array_key_exists($name, $options)
&& !is_null($options[$name])
? $options[$name] : $default;
}
/**
}
/**