mirror/processwire
1
0
Fork 0
mirror of https://github.com/processwire/processwire.git synced 2025-08-08 07:47:00 +02:00
Code Issues Releases Wiki Activity

Installer updates, make utf8mb4 and InnoDB the default settings for MySQL (rather than utf8 and MyISAM)

Browse Source
This commit is contained in:
Ryan Cramer
2025-01-05 11:21:52 -05:00
parent bd5200dfb2
commit 807e94e22a
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
install.php
View File

@@ -11,7 +11,7 @@
* If that file exists, the installer will not run. So if you need to re-run this installer for any * If that file exists, the installer will not run. So if you need to re-run this installer for any
* reason, then you'll want to delete that file. This was implemented just in case someone doesn't delete the installer. * reason, then you'll want to delete that file. This was implemented just in case someone doesn't delete the installer.
* *
* ProcessWire 3.x, Copyright 2024 by Ryan Cramer * ProcessWire 3.x, Copyright 2025 by Ryan Cramer
* https://processwire.com * https://processwire.com
* *
* @todo 3.0.190: provide option for command-line options to install * @todo 3.0.190: provide option for command-line options to install
@@ -478,13 +478,13 @@ class Installer {
if(!isset($values['dbPort'])) $values['dbPort'] = ini_get("mysqli.default_port"); if(!isset($values['dbPort'])) $values['dbPort'] = ini_get("mysqli.default_port");
if(!isset($values['dbUser'])) $values['dbUser'] = ini_get("mysqli.default_user"); if(!isset($values['dbUser'])) $values['dbUser'] = ini_get("mysqli.default_user");
if(!isset($values['dbPass'])) $values['dbPass'] = ini_get("mysqli.default_pw"); if(!isset($values['dbPass'])) $values['dbPass'] = ini_get("mysqli.default_pw");
if(!isset($values['dbEngine'])) $values['dbEngine'] = 'MyISAM'; if(!isset($values['dbEngine'])) $values['dbEngine'] = 'InnoDB';
if(!isset($values['dbSocket'])) $values['dbSocket'] = ini_get("mysqli.default_socket"); if(!isset($values['dbSocket'])) $values['dbSocket'] = ini_get("mysqli.default_socket");
if(!isset($values['dbCon'])) $values['dbCon'] = 'Hostname'; if(!isset($values['dbCon'])) $values['dbCon'] = 'Hostname';
if(!$values['dbHost']) $values['dbHost'] = 'localhost'; if(!$values['dbHost']) $values['dbHost'] = 'localhost';
if(!$values['dbPort']) $values['dbPort'] = 3306; if(!$values['dbPort']) $values['dbPort'] = 3306;
if(empty($values['dbCharset'])) $values['dbCharset'] = 'utf8'; if(empty($values['dbCharset'])) $values['dbCharset'] = 'utf8mb4';
if($values['dbCharset'] != 'utf8mb4') $values['dbCharset'] = 'utf8'; if($values['dbCharset'] != 'utf8mb4') $values['dbCharset'] = 'utf8';
if($values['dbEngine'] != 'InnoDB') $values['dbEngine'] = 'MyISAM'; if($values['dbEngine'] != 'InnoDB') $values['dbEngine'] = 'MyISAM';
@@ -505,9 +505,8 @@ class Installer {
$this->input('dbHost', 'DB Host', $values['dbHost']); $this->input('dbHost', 'DB Host', $values['dbHost']);
$this->input('dbPort', 'DB Port', $values['dbPort']); $this->input('dbPort', 'DB Port', $values['dbPort']);
$this->input('dbSocket', 'DB Socket', $values['dbSocket'], array('width' => 300)); $this->input('dbSocket', 'DB Socket', $values['dbSocket'], array('width' => 300));
$this->select('dbCharset', 'DB Charset', $values['dbCharset'], array('utf8mb4', 'utf8'));
$this->select('dbCharset', 'DB Charset', $values['dbCharset'], array('utf8', 'utf8mb4')); $this->select('dbEngine', 'DB Engine', $values['dbEngine'], array('InnoDB', 'MyISAM'));
$this->select('dbEngine', 'DB Engine', $values['dbEngine'], array('MyISAM', 'InnoDB'));
$this->clear(); $this->clear();
// automatic required states for host, port and socket // automatic required states for host, port and socket
@@ -532,7 +531,6 @@ class Installer {
"; ";
$this->p( $this->p(
"The DB Charset option “utf8mb4” may not be compatible with all 3rd party modules.<br />" .
"The DB Engine option “InnoDB” requires MySQL 5.6.4 or newer.", "The DB Engine option “InnoDB” requires MySQL 5.6.4 or newer.",
array('class' => 'detail', 'style' => 'margin-top:0') array('class' => 'detail', 'style' => 'margin-top:0')
); );
@@ -1134,8 +1132,8 @@ class Installer {
*/ */
protected function profileImportSQL($database, $file1, $file2, array $options = array()) { protected function profileImportSQL($database, $file1, $file2, array $options = array()) {
$defaults = array( $defaults = array(
'dbEngine' => 'MyISAM', 'dbEngine' => 'InnoDB',
'dbCharset' => 'utf8', 'dbCharset' => 'utf8mb4',
); );
$options = array_merge($defaults, $options); $options = array_merge($defaults, $options);
if(self::TEST_MODE) return; if(self::TEST_MODE) return;

2
wire/modules/AdminTheme/AdminThemeUikit/install-foot.inc
View File

@@ -10,7 +10,7 @@ if(!defined("PROCESSWIRE_INSTALL")) die();
<!-- FOOTER --> <!-- FOOTER -->
<footer id='pw-footer' class='uk-margin'> <footer id='pw-footer' class='uk-margin'>
<div class='pw-container uk-container uk-container-center'> <div class='pw-container uk-container uk-container-center'>
<p>ProcessWire 3.x &copy; 2024</p> <p>ProcessWire 3.x &copy; 2025</p>
</div> </div>
</footer> </footer>

2
wire/modules/AdminTheme/AdminThemeUikit/scripts/main.js
View File

@@ -840,7 +840,9 @@ var ProcessWireAdminTheme = {
}); });
$('body').addClass('InputfieldColumnWidthsInit'); $('body').addClass('InputfieldColumnWidthsInit');
if(ProcessWire.config.adminTheme) {
Inputfields.toggleBehavior = ProcessWire.config.adminTheme.toggleBehavior; Inputfields.toggleBehavior = ProcessWire.config.adminTheme.toggleBehavior;
}
initFormMarkup(); initFormMarkup();
}, },

2
wire/modules/AdminTheme/AdminThemeUikit/scripts/main.min.js vendored
View File

File diff suppressed because one or more lines are too long