mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 04:10:38 +02:00
Code Issues Releases Wiki Activity

Fix for database verify charset function.

Browse Source
This commit is contained in:
Cameron
2018-09-12 11:46:23 -07:00
parent 184edd3193
commit 5235b4fcaf
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_admin/db.php
View File

@@ -162,8 +162,6 @@ class system_tools
$this->_utf8_exclude = array(MPREFIX."core"); $this->_utf8_exclude = array(MPREFIX."core");
$this->_options = array( $this->_options = array(
"db_update" => array('diz'=>DBLAN_15, 'label'=>DBLAN_16), "db_update" => array('diz'=>DBLAN_15, 'label'=>DBLAN_16),
"verify_sql" => array('diz'=>DBLAN_4, 'label'=>DBLAN_5), "verify_sql" => array('diz'=>DBLAN_4, 'label'=>DBLAN_5),
@@ -231,12 +229,13 @@ class system_tools
if(isset($_POST['db_update']) || varset($_GET['mode'])=='db_update') // Requires further testing. if(isset($_POST['db_update']) || varset($_GET['mode'])=='db_update') // Requires further testing.
{ {
// header("location: ".e_ADMIN."e107_update.php"); // header("location: ".e_ADMIN."e107_update.php");
$dbupdate = null;
require_once(e_ADMIN."update_routines.php"); require_once(e_ADMIN."update_routines.php");
new e107Update($dbupdate); new e107Update($dbupdate);
return; return;
} }
if(isset($_POST['convert_to_utf8']) || $_GET['mode']=='convert_to_utf8') if(isset($_POST['convert_to_utf8']) || $_GET['mode'] =='convert_to_utf8')
{ {
$this->convertUTF8Form(); $this->convertUTF8Form();
} }
@@ -557,7 +556,7 @@ class system_tools
define('LANINS_133', "This will create a fresh installation of e107 at the domain you specify. Using your server administration software (e.g. cPanel) - park your other domain on top of [x]"); define('LANINS_133', "This will create a fresh installation of e107 at the domain you specify. Using your server administration software (e.g. cPanel) - park your other domain on top of [x]");
e107::getMySQLConfig('user'); // prefix|server|user|password| $config = e107::getMySQLConfig(); // prefix|server|user|password|defaultdb
if(!isset($POST['create_multisite'])) if(!isset($POST['create_multisite']))
{ {
@@ -784,7 +783,7 @@ class system_tools
{ {
$config = e107::getMySQLConfig(); $config = e107::getMySQLConfig();
$dbtable = $config['mySQLdefaultdb']; $dbtable = $config['mySQLdefaultdb'];
//TODO Add a check to be sure the database is not already utf-8. //TODO Add a check to be sure the database is not already utf-8.
// yep, needs more methods - possibly a class in e107_handler // yep, needs more methods - possibly a class in e107_handler

2
e107_handlers/e107_class.php
View File

@@ -732,7 +732,7 @@ class e107
* Example: <code>$e107->getMySQLConfig('prefix');</code> * Example: <code>$e107->getMySQLConfig('prefix');</code>
* *
* @param string $for prefix|server|user|password|defaultdb - leave blank for full array. * @param string $for prefix|server|user|password|defaultdb - leave blank for full array.
* @return string or array * @return string|array
*/ */
public static function getMySQLConfig($for='') public static function getMySQLConfig($for='')
{ {

3
e107_handlers/form_handler.php
View File

@@ -3534,7 +3534,8 @@ class e_form
} }
else else
{ {
$include = (deftrue("FONTAWESOME")) ? "data-loading-icon='fa-spinner' data-disable='true'" : ""; // $include = (deftrue("FONTAWESOME")) ? "data-loading-icon='fa-spinner' data-disable='true'" : "";
$include = (deftrue("FONTAWESOME")) ? "data-loading-icon='fa-spinner' " : ""; // data-disable breaks db.php charset Fix.
} }
$confirmation = LAN_JSCONFIRM; $confirmation = LAN_JSCONFIRM;