Use getDriver().

Conflicts:
	kronolith/lib/Event.php

kronolith/lib/Event.php

@@ -979,10 +979,9 @@ public function toiCalendar($calendar)
             // exceptions. Any exceptions left should represent exceptions with
             // no replacement.
             $exceptions = $this->recurrence->getExceptions();
-            $kronolith_driver = Kronolith::getDriver(null, $this->calendar);
             $search = new stdClass();
             $search->baseid = $this->uid;
-            $results = $kronolith_driver->search($search);
+            $results = $this->getDriver()->search($search);
             foreach ($results as $days) {
                 foreach ($days as $exceptionEvent) {
                     // Need to change the UID so it links to the original
@@ -1421,7 +1420,7 @@ protected function _handlevEventRecurrence($vEvent)
                 /* Delete all existing exceptions to this event if it already
                  * exists */
                 if (!empty($this->uid)) {
-                    $kronolith_driver = Kronolith::getDriver(null, $this->calendar);
+                    $kronolith_driver = $this->getDriver();
                     $search = new StdClass();
                     $search->baseid = $this->uid;
                     $results = $kronolith_driver->search($search);
@@ -1451,13 +1450,12 @@ protected function _handlevEventRecurrence($vEvent)
         // RECURRENCE-ID indicates that this event represents an exception
         try {
             $recurrenceid = $vEvent->getAttribute('RECURRENCE-ID');
-            $kronolith_driver = Kronolith::getDriver(null, $this->calendar);
             $originaldt = new Horde_Date($recurrenceid);
             $this->exceptionoriginaldate = $originaldt;
             $this->baseid = $this->uid;
             $this->uid = null;
             try {
-                $originalEvent = $kronolith_driver->getByUID($this->baseid);
+                $originalEvent = $this->getDriver()->getByUID($this->baseid);
                 $originalEvent->recurrence->addException($originaldt->format('Y'),
                     $originaldt->format('m'),
                     $originaldt->format('d'));
@@ -1542,7 +1540,7 @@ public function fromASAppointment(Horde_ActiveSync_Message_Appointment $message)
         /* Recurrence */
         if ($rrule = $message->getRecurrence()) {
             /* Exceptions */
-            $kronolith_driver = Kronolith::getDriver(null, $this->calendar);
+            $kronolith_driver = $this->getDriver();
             /* Since AS keeps exceptions as part of the original event, we need
              * to delete all existing exceptions and re-create them. The only
              * drawback to this is that the UIDs will change. */
@@ -2578,12 +2576,11 @@ public function boundExceptions($flat = true)
             return array();
         }
         $return = array();
-        $kronolith_driver = Kronolith::getDriver(null, $this->calendar);
         $search = new StdClass();
         $search->start = $this->recurrence->getRecurStart();
         $search->end = $this->recurrence->getRecurEnd();
         $search->baseid = $this->uid;
-        $results = $kronolith_driver->search($search);
+        $results = $this->getDriver()->search($search);
 
         if (!$flat) {
             return $results;