Removed moved function

diff --git a/include/diaspora.php b/include/diaspora.php
index 3c3f5cb25af06ab1ab54018b81a05eef9fc7fba7..d5f2a21d9e5fd3d2eb4490a8a0a701a699c148fe 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -517,7 +517,6 @@ class diaspora {
         * @return string The id of the fcontact entry
         */
        private function add_fcontact($arr, $update = false) {
-               /// @todo Remove this function from include/network.php
 
                if($update) {
                        $r = q("UPDATE `fcontact` SET

diff --git a/include/network.php b/include/network.php
index c6379e407bcc79aae4a3ed852c3409d9225a1f09..27459112d6a9cf2476d7c51c4e7ba537bc9c7623 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -862,64 +862,6 @@ function parse_xml_string($s,$strict = true) {
        return $x;
 }}
 
-function add_fcontact($arr,$update = false) {
-
-       if($update) {
-               $r = q("UPDATE `fcontact` SET
-                       `name` = '%s',
-                       `photo` = '%s',
-                       `request` = '%s',
-                       `nick` = '%s',
-                       `addr` = '%s',
-                       `batch` = '%s',
-                       `notify` = '%s',
-                       `poll` = '%s',
-                       `confirm` = '%s',
-                       `alias` = '%s',
-                       `pubkey` = '%s',
-                       `updated` = '%s'
-                       WHERE `url` = '%s' AND `network` = '%s'",
-                       dbesc($arr['name']),
-                       dbesc($arr['photo']),
-                       dbesc($arr['request']),
-                       dbesc($arr['nick']),
-                       dbesc($arr['addr']),
-                       dbesc($arr['batch']),
-                       dbesc($arr['notify']),
-                       dbesc($arr['poll']),
-                       dbesc($arr['confirm']),
-                       dbesc($arr['alias']),
-                       dbesc($arr['pubkey']),
-                       dbesc(datetime_convert()),
-                       dbesc($arr['url']),
-                       dbesc($arr['network'])
-               );
-       }
-       else {
-               $r = q("insert into fcontact ( `url`,`name`,`photo`,`request`,`nick`,`addr`,
-                       `batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated` )
-                       values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
-                       dbesc($arr['url']),
-                       dbesc($arr['name']),
-                       dbesc($arr['photo']),
-                       dbesc($arr['request']),
-                       dbesc($arr['nick']),
-                       dbesc($arr['addr']),
-                       dbesc($arr['batch']),
-                       dbesc($arr['notify']),
-                       dbesc($arr['poll']),
-                       dbesc($arr['confirm']),
-                       dbesc($arr['network']),
-                       dbesc($arr['alias']),
-                       dbesc($arr['pubkey']),
-                       dbesc(datetime_convert())
-               );
-       }
-
-       return $r;
-}
-
-
 function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
 
        // Suppress "view full size"