Merge remote-tracking branch 'upstream/master'

Conflicts: src/Cache/Factory/DesarrollaCacheFactory.php
EvolutedNewMedia · Aug 12, 2016 · 7d6356e · 7d6356e
2 parents 9a75788 + 553806e
commit 7d6356e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/config/config.php b/config/config.php
@@ -25,6 +25,7 @@
         'host'     => '127.0.0.1',
         'username' => 'root',
         'password' => '',
+        'dbname'   => '',
         'port'     => 3306
     ],
     'redis'       => [

diff --git a/src/Cache/Factory/DesarrollaCacheFactory.php b/src/Cache/Factory/DesarrollaCacheFactory.php
@@ -172,6 +172,7 @@ protected function createMysqlDriver()
                 $this->config['mysql']['host'],
                 $this->config['mysql']['username'],
                 $this->config['mysql']['password'],
+                $this->config['mysql']['dbname'],
                 $this->config['mysql']['port']
             );
         }