Added DB_CHARSET and DB_COLLATE constants to the wp-config.php (ddev#…

…3768) [skip ci]
rfay · May 5, 2022 · a9a72be · a9a72be
1 parent a9d725d
commit a9a72be
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/ddevapp/wordpress.go b/pkg/ddevapp/wordpress.go
@@ -35,6 +35,8 @@ type WordpressConfig struct {
 	SiteSettings     string
 	SiteSettingsDdev string
 	AbsPath          string
+	DbCharset        string
+	DbCollate        string
 }
 
 // NewWordpressConfig produces a WordpressConfig object with defaults.
@@ -60,6 +62,8 @@ func NewWordpressConfig(app *DdevApp, absPath string) *WordpressConfig {
 		SiteSettings:     "wp-config.php",
 		SiteSettingsDdev: "wp-config-ddev.php",
 		AbsPath:          absPath,
+		DbCharset:        "utf8",
+		DbCollate:        "",
 	}
 }
 

diff --git a/pkg/ddevapp/wordpress/wp-config.php b/pkg/ddevapp/wordpress/wp-config.php
@@ -7,6 +7,12 @@
  * @package ddevapp
  */
 
+/** Database charset to use in creating database tables. */
+define( 'DB_CHARSET', '{{ $config.DbCharset }}' );
+
+/** The database collate type. Don't change this if in doubt. */
+define( 'DB_COLLATE', '{{ $config.DbCollate }}' );
+
 /** Authentication Unique Keys and Salts. */
 define( 'AUTH_KEY', '{{ $config.AuthKey }}' );
 define( 'SECURE_AUTH_KEY', '{{ $config.SecureAuthKey }}' );