summaryrefslogtreecommitdiff
path: root/backend
authorAdam Cozzette <acozzette@cs.hmc.edu>2012-02-05 21:51:07 (UTC)
committer Adam Cozzette <acozzette@cs.hmc.edu>2012-02-05 21:51:07 (UTC)
commitaa25544e0ab8a1b9dcc3c47d5953a9a2afc5f77c (patch) (unidiff)
treefd7b52d56d818dcca5605766e728ac004847aede /backend
parentb312e037ebba7c94abea9661bcf62c52b7d73fbf (diff)
downloadclipperz-aa25544e0ab8a1b9dcc3c47d5953a9a2afc5f77c.zip
clipperz-aa25544e0ab8a1b9dcc3c47d5953a9a2afc5f77c.tar.gz
clipperz-aa25544e0ab8a1b9dcc3c47d5953a9a2afc5f77c.tar.bz2
Removing the @ sign in @mysql_connect so that if the MySQL module is not
installed, the Apache log will have an informative error message.
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
@@ -159,17 +159,17 @@ if(count($_POST) > 0 && $_SESSION['diagnosticsSuccessful']==false)
159 } 159 }
160 160
161 /** 161 /**
162 * verify configuration info 162 * verify configuration info
163 */ 163 */
164 if ($errors == 0) 164 if ($errors == 0)
165 { 165 {
166 AddTrace('File Structure....OK!'); 166 AddTrace('File Structure....OK!');
167 if (!@mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass'])) 167 if (!mysql_connect ($GLOBALS['configuration']['host'].":".$GLOBALS['configuration']['port'], $GLOBALS['configuration']['user'], $GLOBALS['configuration']['pass']))
168 { 168 {
169 $errors++; 169 $errors++;
170 AddError('Cannot connect to the specified database server. Edit configuration.php'); 170 AddError('Cannot connect to the specified database server. Edit configuration.php');
171 } 171 }
172 if (isset($GLOBALS['configuration']['db_encoding']) && $GLOBALS['configuration']['db_encoding'] == 1 && !Base64::IsBase64FunctionInstalled()) 172 if (isset($GLOBALS['configuration']['db_encoding']) && $GLOBALS['configuration']['db_encoding'] == 1 && !Base64::IsBase64FunctionInstalled())
173 { 173 {
174 $errors++; 174 $errors++;
175 AddError('$configuration[db_encoding] needs to be set to 0 until you install the base64 plugin. Set db_encoding to 0 by editing configuration.php, run setup again and go to the "Manage Plugins" tab. Install the base64 plugin. Then you can set db_encoding = 1'); 175 AddError('$configuration[db_encoding] needs to be set to 0 until you install the base64 plugin. Set db_encoding to 0 by editing configuration.php, run setup again and go to the "Manage Plugins" tab. Install the base64 plugin. Then you can set db_encoding = 1');