diff --git a/classes/dbupdater.php b/classes/dbupdater.php
index 6a1a5ddfd..01c6a59f1 100644
--- a/classes/dbupdater.php
+++ b/classes/dbupdater.php
@@ -52,7 +52,7 @@ class DbUpdater {
$this->pdo->query($line); // PDO returns errors as exceptions now
} catch (PDOException $e) {
if ($html_output) {
- print_error("Error: " . implode(", ", $this->pdo->errorInfo()));
+ print "
Error: " . implode(", ", $this->pdo->errorInfo()) . "
";
} else {
Debug::log("Error: " . implode(", ", $this->pdo->errorInfo()));
}
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 03c35f536..1f96baae7 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -959,12 +959,12 @@ class Handler_Public extends Handler {
print "";
} else if ($method == 'do') {
@@ -1036,7 +1036,7 @@ class Handler_Public extends Handler {
$mailer = new Mailer();
- $rc = $mailer->mail(["to_name" => $login,
+ $rc = $mailer->mail(["to_name" => $login,
"to_address" => $email,
"subject" => __("[tt-rss] Password reset request"),
"message" => $message]);
@@ -1133,25 +1133,32 @@ class Handler_Public extends Handler {
if ($op == "performupdate") {
if ($updater->isUpdateRequired()) {
- print "" . __("Performing updates") . "
";
-
- print "" . T_sprintf("Updating to schema version %d", SCHEMA_VERSION) . "
";
+ print "" . T_sprintf("Performing updates to schema version %d", SCHEMA_VERSION) . "
";
for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
- print_notice(T_sprintf("Performing update up to version %d...", $i));
+ print "";
+ print "- " . T_sprintf("Updating to version %d", $i) . "
";
+
+ print "- ";
$result = $updater->performUpdateTo($i, true);
+ print "
";
if (!$result) {
- print "".__("FAILED!")."
";
+ print "";
- print_warning("One of the updates failed. Either retry the process or perform updates manually.");
+ print_error("One of the updates failed. Either retry the process or perform updates manually.");
- print "".__("Return to Tiny Tiny RSS")."";
+ print "";
return;
} else {
- print "".__("OK!")."";
+ print "" . __("Completed.") . "";
+ print "";
}
}
diff --git a/schema/versions/mysql/136.sql b/schema/versions/mysql/136.sql
index b4dd70d9b..36539537b 100644
--- a/schema/versions/mysql/136.sql
+++ b/schema/versions/mysql/136.sql
@@ -1,9 +1,9 @@
begin;
alter table ttrss_archived_feeds add column created datetime;
-update ttrss_version set schema_version = 136;
-alter table ttrss_archived_feeds alter column created set not null;
-
update ttrss_archived_feeds set created = NOW();
+alter table ttrss_archived_feeds change created created bool not null;
+
+update ttrss_version set schema_version = 136;
commit;