Merge branch '0.9.x' into adminpanel

Conflicts:
	classes/User.php

1 files changed, 0 insertions, 14 deletions

diff --git a/lib/plugin.php b/lib/plugin.php
index 59bf3ba9d..87d7be5a7 100644
--- a/lib/plugin.php
+++ b/lib/plugin.php
@@ -76,18 +76,4 @@ class Plugin
     {
         return true;
     }
-
-    /* 
-    * the name of the shortener
-    * shortenerInfo associative array with additional information. One possible element is 'freeService' which can be true or false
-    * shortener array, first element is the name of the class, second element is an array to be passed as constructor parameters to the class
-    */
-    function registerUrlShortener($name, $shortenerInfo, $shortener)
-    {
-        global $_shorteners;
-        if(!is_array($_shorteners)){
-            $_shorteners=array();
-        }
-        $_shorteners[$name]=array('info'=>$shortenerInfo, 'callInfo'=>$shortener);
-    }
 }