Remove deprecated code

[friendica.git] / src / Protocol / Diaspora.php

diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php
index 31c7ccf21cbfc47f610bc8403a84b59a309b5091..bff56d5af39bbe9864bde864364758432709bdde 100644 (file)
--- a/src/Protocol/Diaspora.php
+++ b/src/Protocol/Diaspora.php
@@ -14,7 +14,6 @@ use Friendica\Content\Feature;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Markdown;
 use Friendica\Core\Cache\Duration;
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Core\System;
@@ -409,7 +408,7 @@ class Diaspora
        }
 
        /**
-        * @brief: Decodes incoming Diaspora message in the new format
+        * Decodes incoming Diaspora message in the new format
         *
         * @param string  $raw      raw post message
         * @param string  $privKey   The private key of the importer
@@ -515,7 +514,7 @@ class Diaspora
        }
 
        /**
-        * @brief: Decodes incoming Diaspora message in the deprecated format
+        * Decodes incoming Diaspora message in the deprecated format
         *
         * @param string $xml      urldecoded Diaspora salmon
         * @param string $privKey  The private key of the importer
@@ -4093,7 +4092,7 @@ class Diaspora
                        FROM `profile`
                        INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
                        INNER JOIN `contact` ON `profile`.`uid` = `contact`.`uid`
-                       WHERE `user`.`uid` = %d AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
+                       WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
                        intval($uid)
                );