Version 4.5.0
This commit is contained in:
1 parent
1a0c7fd3c2
commit
f79dcf067a
3791 files changed
+248032
-76372
No files matched your search
@@ -67,7 +67,7 @@ class archive extends \IPSUtf8\Dispatcher\Controller
|
||||
$percent = round( ($json['convertedCount'] / \IPSUtf8\Convert\Archive::i()->getTotalRowsToConvert()) * 100, 2 );
|
||||
$msg = "Processing " . \IPSUtf8\Session::i()->current_table . ' (Total: ' . $percent . '%)';
|
||||
|
||||
if ( in_array( \IPSUtf8\Convert\Archive::ARCHIVE_TABLE, array_keys( \IPSUtf8\Session::i()->completed_json ) ) )
|
||||
if ( \in_array( \IPSUtf8\Convert\Archive::ARCHIVE_TABLE, array_keys( \IPSUtf8\Session::i()->completed_json ) ) )
|
||||
{
|
||||
\IPSUtf8\Session::i()->status = 'completed';
|
||||
\IPSUtf8\Session::i()->save();
|
||||
@@ -132,14 +132,14 @@ class archive extends \IPSUtf8\Dispatcher\Controller
|
||||
exit();
|
||||
}
|
||||
|
||||
if ( ! count( \IPSUtf8\Session::i()->has_archive ) )
|
||||
if ( ! \count( \IPSUtf8\Session::i()->has_archive ) )
|
||||
{
|
||||
\IPSUtf8\Output\Browser::i()->error("Cannot locate a separate database for the post archive.");
|
||||
exit();
|
||||
}
|
||||
|
||||
|
||||
if ( ! count( \IPSUtf8\Session::i()->tables ) )
|
||||
if ( ! \count( \IPSUtf8\Session::i()->tables ) )
|
||||
{
|
||||
\IPSUtf8\Output\Browser::i()->error("No tables found for processing. Please check to ensure the correct database name and prefix are being used.");
|
||||
exit();
|
||||
|
||||
@@ -160,7 +160,7 @@ class browser extends \IPSUtf8\Dispatcher\Controller
|
||||
exit();
|
||||
}
|
||||
|
||||
if ( ! count( \IPSUtf8\Session::i()->tables ) )
|
||||
if ( ! \count( \IPSUtf8\Session::i()->tables ) )
|
||||
{
|
||||
\IPSUtf8\Output\Browser::i()->error("No tables found for processing. Please check to ensure the correct database name and prefix are being used.");
|
||||
exit();
|
||||
|
||||
@@ -34,6 +34,15 @@ class tools extends \IPSUtf8\Dispatcher\Controller
|
||||
*/
|
||||
public function collation()
|
||||
{
|
||||
if( ( version_compare( \IPSUtf8\Db::i()->server_info, '5.5.3', '>=' ) AND \IPSUtf8\Db::i('utf8')->set_charset('utf8mb4') !== FALSE ) )
|
||||
{
|
||||
$sessionData = \IPSUtf8\Session::i()->json;
|
||||
$sessionData['use_utf8mb4'] = 1;
|
||||
|
||||
\IPSUtf8\Session::i()->json = $sessionData;
|
||||
\IPSUtf8\Session::i()->save();
|
||||
}
|
||||
|
||||
\IPSUtf8\Convert::i()->fixCollation();
|
||||
|
||||
$this->manage( "Collation checked and fixed where appropriate" );
|
||||
|
||||
Reference in new issue
Block a user