dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Missing param in MySQL::tryToConnect

Browse Source
This commit is contained in:
dMetzger
2012-08-16 07:10:41 +00:00
parent e1e434ebe1
commit 4f8d07b075
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Translate.php
+1 -1
View File
@@ -132,7 +132,7 @@ class TranslateCore
$local_path = _PS_MODULE_DIR_.$name.'/';
if (!isset($name) || !isset($translations_merged[$name]))
if (!isset($translations_merged[$name]))
{
// Check if translations exists in a current theme
if (Tools::file_exists_cache(_PS_THEME_DIR_.'modules/'.$name.'/translations/'.Context::getContext()->language->iso_code.'.php'))
classes/db/MySQL.php
+1 -1
View File
@@ -154,7 +154,7 @@ class MySQLCore extends Db
/**
* @see Db::checkConnection()
*/
public static function tryToConnect($server, $user, $pwd, $db, $newDbLink = true, $engine = null)
public static function tryToConnect($server, $user, $pwd, $db, $newDbLink = true, $engine = null, $timeout = 5)
{
ini_set('mysql.connect_timeout', $timeout);
if (!$link = @mysql_connect($server, $user, $pwd, $newDbLink))