Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites...

[friendica.git] / include / network.php

diff --git a/include/network.php b/include/network.php
index 09a6239193ca12c02a963f52d24c677755df9bcf..419a96020e9a27f7c0d1409f5a74fd13f1f59964 100644 (file)
--- a/include/network.php
+++ b/include/network.php
@@ -809,12 +809,12 @@ function short_link($url) {
                $yourls->set('password', $yourls_password);
                $yourls->set('ssl', $yourls_ssl);
                $yourls->set('yourls-url', $yourls_url);
-               $slinky->set_cascade( array($yourls, new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL()));
+               $slinky->set_cascade(array($yourls, new Slinky_Ur1ca(), new Slinky_TinyURL()));
        } else {
                // setup a cascade of shortening services
                // try to get a short link from these services
-               // in the order ur1.ca, trim, id.gd, tinyurl
-               $slinky->set_cascade(array(new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL()));
+               // in the order ur1.ca, tinyurl
+               $slinky->set_cascade(array(new Slinky_Ur1ca(), new Slinky_TinyURL()));
        }
        return $slinky->short();
 }