fix path and class name

diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
index 21e816b12750af7706f2e2f655989f2d965efd5d..4c011e5d764662d7adce2f54ad4e7bc90288e6a3 100755 (executable)
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -7,7 +7,7 @@
  */
 
 require_once ('../../../lib/base.php');
-require_once(OC::$THIRDPARTYROOT . 'when/When.php');
+require_once('when/When.php');
 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('calendar');

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index 40de6deb432ed786b8506ee92a172ccf16f414a8..4ea736885051fafdd55dae45c25540d74c9dcbf3 100644 (file)
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -8,8 +8,8 @@
  * 
  * This class manages our app actions
  */
-self::$l10n = new OC_L10N('calendar');
-self::$tz = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
+OC_Calendar_App::$l10n = new OC_L10N('calendar');
+OC_Calendar_App::$tz = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
 class OC_Calendar_App{
        const CALENDAR = 'calendar';
        const EVENT = 'event';