Skip to content

Commit

Permalink
Merge pull request #10437 from highfalutin/config-help-text
Browse files Browse the repository at this point in the history
Add help text to civicrm.settings.php re: DSNs containing quotes/backslashes
  • Loading branch information
monishdeb authored May 30, 2017
2 parents 6b691b6 + 9beff2c commit a0fba50
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion templates/CRM/common/civicrm.settings.php.template
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ if (!defined('CIVICRM_UF')) {
/**
* Content Management System (CMS) Datasource:
*
* Update this setting with your CMS (Drupal, Backdrop CMS, or Joomla) database username, server and DB name.
* Update this setting with your CMS (Drupal, Backdrop CMS, or Joomla) database username, password, server and DB name.
* If any of these contain a single quote or backslash, escape those characters with a backslash: \' and \\, respectively.
*
* Datasource (DSN) format:
* define( 'CIVICRM_UF_DSN', 'mysql://cms_db_username:cms_db_password@db_server/cms_database?new_link=true');
*/
Expand All @@ -92,6 +94,9 @@ if (!defined('CIVICRM_UF_DSN') && CIVICRM_UF !== 'UnitTests') {
* CiviCRM DB Name = civicrm, CiviCRM DB User = civicrm
* define( 'CIVICRM_DSN' , 'mysql://civicrm:YOUR_PASSWORD@localhost/civicrm?new_link=true');
*
* If your username, password, server or DB name contain a single quote or backslash, escape those characters
* with a backslash: \' and \\, respectively.
*
*/
if (!defined('CIVICRM_DSN')) {
if (CIVICRM_UF === 'UnitTests' && isset($GLOBALS['_CV']['TEST_DB_DSN'])) {
Expand Down

0 comments on commit a0fba50

Please sign in to comment.