wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

less newlines for the scripts/upgrade.php output

Browse Source
This commit is contained in:
Mikael Nordfeldth 2015-02-19 19:40:36 +01:00
parent e299583eee
commit 5471c65c9a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/File.php
View File

@ -623,7 +623,7 @@ class File extends Managed_DataObject
// We already have the urlhash field, so no need to migrate it. // We already have the urlhash field, so no need to migrate it.
return; return;
} }
echo "\nFound old $table table, upgrading it to contain 'urlhash' field...\n"; echo "\nFound old $table table, upgrading it to contain 'urlhash' field...";
// We have to create a urlhash that is _not_ the primary key, // We have to create a urlhash that is _not_ the primary key,
// transfer data and THEN run checkSchema // transfer data and THEN run checkSchema
$schemadef['fields']['urlhash'] = array ( $schemadef['fields']['urlhash'] = array (
@ -637,7 +637,7 @@ class File extends Managed_DataObject
$classname = ucfirst($table); $classname = ucfirst($table);
$tablefix = new $classname; $tablefix = new $classname;
// urlhash is hash('sha256', $url) in the File table // urlhash is hash('sha256', $url) in the File table
echo "Updating urlhash fields in $table table...\n"; echo "Updating urlhash fields in $table table...";
// Maybe very MySQL specific :( // Maybe very MySQL specific :(
$tablefix->query(sprintf('UPDATE %1$s SET %2$s=%3$s;', $tablefix->query(sprintf('UPDATE %1$s SET %2$s=%3$s;',
$schema->quoteIdentifier($table), $schema->quoteIdentifier($table),

4
classes/File_redirection.php
View File

@ -367,7 +367,7 @@ class File_redirection extends Managed_DataObject
// We already have the urlhash field, so no need to migrate it. // We already have the urlhash field, so no need to migrate it.
return; return;
} }
echo "\nFound old $table table, upgrading it to contain 'urlhash' field...\n"; echo "\nFound old $table table, upgrading it to contain 'urlhash' field...";
// We have to create a urlhash that is _not_ the primary key, // We have to create a urlhash that is _not_ the primary key,
// transfer data and THEN run checkSchema // transfer data and THEN run checkSchema
$schemadef['fields']['urlhash'] = array ( $schemadef['fields']['urlhash'] = array (
@ -381,7 +381,7 @@ class File_redirection extends Managed_DataObject
$classname = ucfirst($table); $classname = ucfirst($table);
$tablefix = new $classname; $tablefix = new $classname;
// urlhash is hash('sha256', $url) in the File table // urlhash is hash('sha256', $url) in the File table
echo "Updating urlhash fields in $table table...\n"; echo "Updating urlhash fields in $table table...";
// Maybe very MySQL specific :( // Maybe very MySQL specific :(
$tablefix->query(sprintf('UPDATE %1$s SET %2$s=%3$s;', $tablefix->query(sprintf('UPDATE %1$s SET %2$s=%3$s;',
$schema->quoteIdentifier($table), $schema->quoteIdentifier($table),