Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-09-2…

…9-14-51-41
civicrm · Sep 29, 2014 · e7357d6 · e7357d6
2 parents 2ac8532 + a5d44ed
commit e7357d6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bin/setup.sh b/bin/setup.sh
@@ -51,7 +51,7 @@ fi
 # checkout, not packaged code
 if [ -d "$CALLEDPATH/../xml" ]; then
   cd "$CALLEDPATH/../xml"
-  "$PHP5PATH"php GenCode.php $SCHEMA '' $GENCODE_CMS
+  "$PHP5PATH"php -d mysql.default_host=$DBHOST -d mysql.default_user=$DBUSER -d mysql.default_password=$DBPASS GenCode.php $SCHEMA '' $GENCODE_CMS
 fi
 
 # someone might want to use empty password for development,