Merge branch 'master' into sabredav_1.6

3 files changed, 3 insertions, 16 deletions

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 22c1133e006..4b481a4f286 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -9,7 +9,7 @@
 /**
  * This class manages our app actions
  */
-OC_Calendar_App::$l10n = new OC_L10N('calendar');
+OC_Calendar_App::$l10n = OC_L10N::get('calendar');
 class OC_Calendar_App{
 	public static $l10n;
 	protected static $categories = null;
diff --git a/apps/calendar/lib/hooks.php b/apps/calendar/lib/hooks.php
index 54f1680a36e..22e8d8e20f2 100644
--- a/apps/calendar/lib/hooks.php
+++ b/apps/calendar/lib/hooks.php
@@ -24,17 +24,4 @@ class OC_Calendar_Hooks{
 
 		return true;
 	}
-
-	/**
-	 * @brief Adds the CardDAV resource to the DAV server
-	 * @param paramters parameters from initialize-Hook
-	 * @return array
-	 */
-	public static function initializeCalDAV($parameters){
-		// We need a backend, the root node and the caldav plugin
-		$parameters['backends']['caldav'] = new OC_Connector_Sabre_CalDAV();
-		$parameters['nodes'][] = new Sabre_CalDAV_CalendarRootNode($parameters['backends']['principal'], $parameters['backends']['caldav']);
-		$parameters['plugins'][] = new Sabre_CalDAV_Plugin();
-		return true;
-	}
 }
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 10fc3f84346..0e1a9032666 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -1,6 +1,6 @@
 <?php
-class OC_Search_Provider_Calendar implements OC_Search_Provider{
-	static function search($query){
+class OC_Search_Provider_Calendar extends OC_Search_Provider{
+	function search($query){
 		$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
 		if(count($calendars)==0 || !OC_App::isEnabled('calendar')){
 			//return false;