Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2

[friendica.git] / include / dbstructure.php

diff --git a/include/dbstructure.php b/include/dbstructure.php
index 9b4921eb83888b598af4406e832559e4b6074b3e..268bbbb66944060cb1f9b7d16b9ca464ad3f6716 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -30,7 +30,7 @@ function convert_to_innodb() {
                $sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", dbesc($table['TABLE_NAME']));
                echo $sql."\n";
 
-               $result = @$db->q($sql);
+               $result = $db->q($sql);
                if (!dbm::is_result($result)) {
                        print_update_error($db, $sql);
                }
@@ -85,6 +85,7 @@ function update_fail($update_id, $error_message) {
 
 
        /*
+        @TODO deprecated code?
        $email_tpl = get_intltext_template("update_fail_eml.tpl");
        $email_msg = replace_macros($email_tpl, array(
                '$sitename' => $a->config['sitename'],
@@ -1764,10 +1765,10 @@ function dbstructure_run(&$argv, &$argc) {
        }
 
        if (is_null($db)) {
-               @include(".htconfig.php");
-               require_once("include/dba.php");
+               @include ".htconfig.php";
+               require_once "include/dba.php";
                $db = new dba($db_host, $db_user, $db_pass, $db_data);
-                       unset($db_host, $db_user, $db_pass, $db_data);
+               unset($db_host, $db_user, $db_pass, $db_data);
        }
 
        if ($argc == 2) {