summaryrefslogtreecommitdiff
path: root/backend
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-02-08 23:08:46 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2012-02-08 23:08:46 (UTC)
commit17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb (patch) (side-by-side diff)
tree4117988aa276fd20d624c60a37f3e05e2fa2c19b /backend
parent67455b069c4c9ec493f9cef76017e172a430a7d4 (diff)
parent96d01919d3ff42c3fdd7f6186a0500caccd3c140 (diff)
downloadclipperz-17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb.zip
clipperz-17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb.tar.gz
clipperz-17efce23d9f205f56f5ebbe8e4f4ca581ea47bcb.tar.bz2
Merge branch 'master' of github.com:gcsolaroli/password-manager into php+gamma
Diffstat (limited to 'backend') (more/less context) (ignore whitespace changes)
-rw-r--r--backend/php/src/setup/index.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/php/src/setup/index.php b/backend/php/src/setup/index.php
index 4087961..93dea6f 100644
--- a/backend/php/src/setup/index.php
+++ b/backend/php/src/setup/index.php
@@ -161,13 +161,13 @@ if(count($_POST) > 0 && $_SESSION['diagnosticsSuccessful']==false)
/**
* verify configuration info
*/
if ($errors == 0)
{
AddTrace('File Structure....OK!');
- if (!@mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass']))
+ if (!mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass']))
{
$errors++;
AddError('Cannot connect to the specified database server. Edit configuration.php');
}
if (isset($GLOBALS['configuration']['db_encoding']) && $GLOBALS['configuration']['db_encoding'] == 1 && !Base64::IsBase64FunctionInstalled())
{