]> git.mxchange.org Git - friendica.git/blobdiff - include/dbstructure.php
Merge branch 'develop' into rewrites/dbm_is_result
[friendica.git] / include / dbstructure.php
index cd80a0865d31d0b822ce71dab07afe520f206459..be1158eabec341f02c56c69a3834091ac2704f2c 100644 (file)
@@ -56,11 +56,11 @@ function update_fail($update_id, $error_message){
        $email_tpl = get_intltext_template("update_fail_eml.tpl");
        $email_msg = replace_macros($email_tpl, array(
                '$sitename' => $a->config['sitename'],
-               '$siteurl' =>  $a->get_baseurl(),
+               '$siteurl' =>  App::get_baseurl(),
                '$update' => DB_UPDATE_VERSION,
                '$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
        ));
-       $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+       $subject=sprintf(t('Update Error at %s'), App::get_baseurl());
        require_once('include/email.php');
        $subject = email_header_encode($subject,'UTF-8');
        mail($a->config['admin_email'], $subject, $email_msg,
@@ -188,7 +188,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
                $sql3="";
                if (!isset($database[$name])) {
                        $r = db_create_table($name, $structure["fields"], $charset, $verbose, $action, $structure['indexes']);
-                       if(!dbm::is_result($r)) {
+                       if (!dbm::is_result($r)) {
                                $errors .=  t('Errors encountered creating database tables.').$name.EOL;
                        }
                        $is_new_table = True;
@@ -265,7 +265,7 @@ function update_structure($verbose, $action, $tables=null, $definition=null) {
 
                        if ($action) {
                                $r = @$db->q($sql3);
-                               if(dbm::is_result($r))
+                               if (dbm::is_result($r))
                                        $errors .= t('Errors encountered performing database changes.').$sql3.EOL;
                        }
                }