Skip to content

Commit

Permalink
Update database.php
Browse files Browse the repository at this point in the history
  • Loading branch information
zero-24 committed Nov 4, 2015
1 parent 19f1e44 commit fb8e1cd
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions administrator/components/com_installer/models/database.php
Expand Up @@ -168,7 +168,6 @@ public function fixSchemaVersion($changeSet)
*
* @return mixed version if successful, false if fail.
*/

public function getUpdateVersion()
{
$table = JTable::getInstance('Extension');
Expand Down Expand Up @@ -270,15 +269,15 @@ public function convertTablesToUtf8mb4()
// Get the SQL file to convert the core tables. Yes, this is hardcoded because we have all sorts of index
// conversions and funky things we can't automate in core tables without an actual SQL file.
$serverType = $db->getServerType();
$fileName = JPATH_ADMINISTRATOR . "/components/com_admin/sql/updates/$serverType/3.5.0-2015-01-01.sql";
$fileName = JPATH_ADMINISTRATOR . "/components/com_admin/sql/updates/$serverType/3.5.0-2015-07-01.sql";

if (!is_file($fileName))
{
return;
}

$fileContents = @file_get_contents($fileName);
$queries = $db->splitSql($fileContents);
$queries = $db->splitSql($fileContents);

if (empty($queries))
{
Expand Down

0 comments on commit fb8e1cd

Please sign in to comment.