diff --git a/classes/dbupdater.php b/classes/dbupdater.php
index 3cc6e9125..e923c7fcb 100644
--- a/classes/dbupdater.php
+++ b/classes/dbupdater.php
@@ -11,16 +11,16 @@ class DbUpdater {
$this->need_version = (int) $need_version;
}
- function getSchemaVersion() {
+ function get_schema_version() {
$row = $this->pdo->query("SELECT schema_version FROM ttrss_version")->fetch();
return (int) $row['schema_version'];
}
- function isUpdateRequired() {
- return $this->getSchemaVersion() < $this->need_version;
+ function is_update_required() {
+ return $this->get_schema_version() < $this->need_version;
}
- function getSchemaLines($version) {
+ function get_schema_lines($version) {
$filename = "schema/versions/".$this->db_type."/$version.sql";
if (file_exists($filename)) {
@@ -31,10 +31,10 @@ class DbUpdater {
}
}
- function performUpdateTo($version, $html_output = true) {
- if ($this->getSchemaVersion() == $version - 1) {
+ function update_to($version, $html_output = true) {
+ if ($this->get_schema_version() == $version - 1) {
- $lines = $this->getSchemaLines($version);
+ $lines = $this->get_schema_lines($version);
if (is_array($lines)) {
@@ -63,7 +63,7 @@ class DbUpdater {
}
}
- $db_version = $this->getSchemaVersion();
+ $db_version = $this->get_schema_version();
if ($db_version == $version) {
$this->pdo->commit();
diff --git a/classes/handler/public.php b/classes/handler/public.php
index 6ea02c361..ca963d111 100755
--- a/classes/handler/public.php
+++ b/classes/handler/public.php
@@ -1143,17 +1143,17 @@ class Handler_Public extends Handler {
$updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
if ($op == "performupdate") {
- if ($updater->isUpdateRequired()) {
+ if ($updater->is_update_required()) {
print "
" . T_sprintf("Performing updates to version %d", SCHEMA_VERSION) . "
";
- for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+ for ($i = $updater->get_schema_version() + 1; $i <= SCHEMA_VERSION; $i++) {
print "";
print "- " . T_sprintf("Updating to version %d", $i) . "
";
print "- ";
- $result = $updater->performUpdateTo($i, true);
+ $result = $updater->update_to($i, true);
print "
";
if (!$result) {
@@ -1184,10 +1184,10 @@ class Handler_Public extends Handler {
print "".__("Return to Tiny Tiny RSS")."";
}
} else {
- if ($updater->isUpdateRequired()) {
+ if ($updater->is_update_required()) {
print "".T_sprintf("Tiny Tiny RSS database needs update to the latest version (%d to %d).",
- $updater->getSchemaVersion(), SCHEMA_VERSION)."
";
+ $updater->get_schema_version(), SCHEMA_VERSION)."";
if (DB_TYPE == "mysql") {
print_error("READ THIS: Due to MySQL limitations, your database is not completely protected while updating. ".
diff --git a/update.php b/update.php
index 56158ca48..cb927e49a 100755
--- a/update.php
+++ b/update.php
@@ -380,8 +380,8 @@
$updater = new DbUpdater(Db::pdo(), DB_TYPE, SCHEMA_VERSION);
- if ($updater->isUpdateRequired()) {
- Debug::log("Schema update required, version " . $updater->getSchemaVersion() . " to " . SCHEMA_VERSION);
+ if ($updater->is_update_required()) {
+ Debug::log("Schema update required, version " . $updater->get_schema_version() . " to " . SCHEMA_VERSION);
if (DB_TYPE == "mysql")
Debug::Log("READ THIS: Due to MySQL limitations, your database is not completely protected while updating.\n".
@@ -400,10 +400,10 @@
Debug::log("Performing updates to version " . SCHEMA_VERSION . "...");
- for ($i = $updater->getSchemaVersion() + 1; $i <= SCHEMA_VERSION; $i++) {
+ for ($i = $updater->get_schema_version() + 1; $i <= SCHEMA_VERSION; $i++) {
Debug::log("* Updating to version $i...");
- $result = $updater->performUpdateTo($i, false);
+ $result = $updater->update_to($i, false);
if ($result) {
Debug::log("* Completed.");