diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-03-01 20:56:51 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-03-01 21:00:23 +0100 |
| commit | 5dcd9e20d03f089408ada52e3ea5462c88bf191a (patch) | |
| tree | e71703b7856eb6d81bb73361d32a5629c92c687b | |
| parent | ec2f49833da5c1fdb54d63c4ec05b7309c4e3c68 (diff) | |
| download | nextcloud-server-5dcd9e20d03f089408ada52e3ea5462c88bf191a.tar.gz nextcloud-server-5dcd9e20d03f089408ada52e3ea5462c88bf191a.zip | |
Small cleanups
| -rw-r--r-- | apps/calendar/lib/calendar.php | 3 | ||||
| -rw-r--r-- | apps/contacts/lib/app.php | 2 | ||||
| -rw-r--r-- | apps/contacts/lib/hooks.php | 2 | ||||
| -rw-r--r-- | lib/base.php | 10 |
4 files changed, 13 insertions, 4 deletions
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php index 277539af97d..7eeb004d181 100644 --- a/apps/calendar/lib/calendar.php +++ b/apps/calendar/lib/calendar.php @@ -240,9 +240,10 @@ class OC_Calendar_Calendar{ '#9fc6e7', // "light blue" ); } + public static function getEventSourceInfo($calendar){ return array( - 'url' => 'ajax/events.php?calendar_id='.$calendar['id'], + 'url' => OC_Helper::linkTo('calendar', 'ajax/events.php').'?calendar_id='.$calendar['id'], 'backgroundColor' => $calendar['calendarcolor'], 'borderColor' => '#888', 'textColor' => 'black', diff --git a/apps/contacts/lib/app.php b/apps/contacts/lib/app.php index ff348403a9b..ce52df4b75e 100644 --- a/apps/contacts/lib/app.php +++ b/apps/contacts/lib/app.php @@ -83,7 +83,7 @@ class OC_Contacts_App { $vcard = OC_VObject::parse($card['carddata']); // Try to fix cards with missing 'N' field from pre ownCloud 4. Hot damn, this is ugly... if(!is_null($vcard) && !$vcard->__isset('N')) { - $appinfo = $info=OC_App::getAppInfo('contacts'); + $appinfo = OC_App::getAppInfo('contacts'); if($appinfo['version'] >= 5) { OC_Log::write('contacts','OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OC_Log::DEBUG); } diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php index 10ae82bbf4f..b858c4a5a48 100644 --- a/apps/contacts/lib/hooks.php +++ b/apps/contacts/lib/hooks.php @@ -29,7 +29,7 @@ class OC_Contacts_Hooks{ * @param paramters parameters from postDeleteUser-Hook * @return array */ - public function deleteUser($parameters) { + static public function deleteUser($parameters) { $addressbooks = OC_Contacts_Addressbook::all($parameters['uid']); foreach($addressbooks as $addressbook) { diff --git a/lib/base.php b/lib/base.php index 5a4904c50f2..0df6631df4d 100644 --- a/lib/base.php +++ b/lib/base.php @@ -213,7 +213,15 @@ class OC{ } // set the right include path - set_include_path(OC::$SERVERROOT.'/lib'.PATH_SEPARATOR.OC::$SERVERROOT.'/config'.PATH_SEPARATOR.OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR.OC::$APPSROOT.PATH_SEPARATOR.OC::$APPSROOT.'/apps'.PATH_SEPARATOR.get_include_path().PATH_SEPARATOR.OC::$SERVERROOT); + set_include_path( + OC::$SERVERROOT.'/lib'.PATH_SEPARATOR. + OC::$SERVERROOT.'/config'.PATH_SEPARATOR. + OC::$THIRDPARTYROOT.'/3rdparty'.PATH_SEPARATOR. + OC::$APPSROOT.PATH_SEPARATOR. + OC::$APPSROOT.'/apps'.PATH_SEPARATOR. + get_include_path().PATH_SEPARATOR. + OC::$SERVERROOT + ); // Redirect to installer if not installed if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') { |