"update" is enough

diff --git a/boot.php b/boot.php
index bfdf7db84d659d8801509fef9bc679d1056cb4d5..79cf3e5b3e4970c84de8796411969a1da73feb69 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -702,7 +702,7 @@ function update_db(App $a)
 
                                // run new update routine
                                // it update the structure in one call
-                               $retval = DBStructure::updateStructure(false, true);
+                               $retval = DBStructure::update(false, true);
                                if ($retval) {
                                        DBStructure::updateFail(
                                                DB_UPDATE_VERSION,

diff --git a/mod/admin.php b/mod/admin.php
index 7af3f246dc6d9681a041c778d7aeb23be77263cb..8a5ec1f1a810e903de8f981a394a221ee63e9dd7 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -722,7 +722,7 @@ function admin_page_summary(App $a)
        }
 
        if (Config::get('system', 'dbupdate', DB_UPDATE_NOT_CHECKED) == DB_UPDATE_NOT_CHECKED) {
-               DBStructure::updateStructure(false, true);
+               DBStructure::update(false, true);
        }
        if (Config::get('system', 'dbupdate') == DB_UPDATE_FAILED) {
                $showwarning = true;
@@ -1385,7 +1385,7 @@ function admin_page_dbsync(App $a)
        }
 
        if (($a->argc > 2) && (intval($a->argv[2]) || ($a->argv[2] === 'check'))) {
-               $retval = DBStructure::updateStructure(false, true);
+               $retval = DBStructure::update(false, true);
                if (!$retval) {
                        $o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION) . "<br />";
                        Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success');

diff --git a/mod/install.php b/mod/install.php
index f2edf649813af58d419a83c6ef0e089f6bac1c8c..81e4805b2e5c7c1ee00ef1945b5dbf87e6293d64 100644 (file)
--- a/mod/install.php
+++ b/mod/install.php
@@ -536,7 +536,7 @@ function load_database_rem($v, $i) {
 }
 
 function load_database() {
-       $errors = DBStructure::updateStructure(false, true);
+       $errors = DBStructure::update(false, true);
 
        return $errors;
 }

diff --git a/scripts/dbstructure.php b/scripts/dbstructure.php
index 58c1011fb95e84b6bc2cdbfaa0587105bfb7af24..d293fc8714b5749e86ff7ab0d21283af52bfed06 100755 (executable)
--- a/scripts/dbstructure.php
+++ b/scripts/dbstructure.php
@@ -21,10 +21,10 @@ unset($db_host, $db_user, $db_pass, $db_data);
 if ($_SERVER["argc"] == 2) {
        switch ($_SERVER["argv"][1]) {
                case "dryrun":
-                       DBStructure::updateStructure(true, false);
+                       DBStructure::update(true, false);
                        return;
                case "update":
-                       DBStructure::updateStructure(true, true);
+                       DBStructure::update(true, true);
 
                        $build = Config::get('system','build');
                        if (!x($build)) {

diff --git a/src/Database/DBStructure.php b/src/Database/DBStructure.php
index bada70348f6d72c7467f99b38c13f547a1534084..68d5e42feded76c1e9c69d5e2ed320083cd553c6 100644 (file)
--- a/src/Database/DBStructure.php
+++ b/src/Database/DBStructure.php
@@ -182,7 +182,7 @@ class DBStructure {
                return t('Errors encountered performing database changes: ').$message.EOL;
        }
 
-       public static function updateStructure($verbose, $action, $tables = null, $definition = null) {
+       public static function update($verbose, $action, $tables = null, $definition = null) {
                if ($action) {
                        Config::set('system', 'maintenance', 1);
                        Config::set('system', 'maintenance_reason', sprintf(t(': Database update'), DBM::date().' '.date('e')));
@@ -1686,4 +1686,4 @@ class DBStructure {
 
                return($database);
        }
-}
\ No newline at end of file
+}