Merge remote-tracking branch 'upstream/master' into develop

[friendica.git] / src / Core / Console / ArchiveContact.php

diff --git a/src/Core/Console/ArchiveContact.php b/src/Core/Console/ArchiveContact.php
index fda398c8a2fd7a6ef1247ecfc4368f7c1e1bba8d..481037a5f6a2d6e6696461f0e85bb45400002964 100644 (file)
--- a/src/Core/Console/ArchiveContact.php
+++ b/src/Core/Console/ArchiveContact.php
@@ -4,7 +4,7 @@ namespace Friendica\Core\Console;
 
 use Friendica\App;
 use Friendica\Core\L10n;
-use Friendica\Database\dba;
+use Friendica\Database\DBA;
 use RuntimeException;
 
 /**
@@ -39,7 +39,7 @@ HELP;
 
        protected function doExecute()
        {
-               $a = get_app();
+               $a = \Friendica\BaseObject::getApp();
 
                if ($this->getOption('v')) {
                        $this->out('Class: ' . __CLASS__);
@@ -56,17 +56,17 @@ HELP;
                        throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
                }
 
-               if ($a->mode === App::MODE_INSTALL) {
+               if ($a->getMode()->isInstall()) {
                        throw new RuntimeException('Friendica isn\'t properly installed yet.');
                }
 
                $nurl = normalise_link($this->getArgument(0));
-               if (!dba::exists('contact', ['nurl' => $nurl, 'archive' => false])) {
+               if (!DBA::exists('contact', ['nurl' => $nurl, 'archive' => false])) {
                        throw new RuntimeException(L10n::t('Could not find any unarchived contact entry for this URL (%s)', $nurl));
                }
-               if (dba::update('contact', ['archive' => true], ['nurl' => $nurl])) {
+               if (DBA::update('contact', ['archive' => true], ['nurl' => $nurl])) {
                        $condition = ["`cid` IN (SELECT `id` FROM `contact` WHERE `archive`)"];
-                       dba::delete('queue', $condition);
+                       DBA::delete('queue', $condition);
                        $this->out(L10n::t('The contact entries have been archived'));
                } else {
                        throw new RuntimeException('The contact archival failed.');