Skip to content
Snippets Groups Projects
Commit 5dcd9e20 authored by Bart Visscher's avatar Bart Visscher
Browse files

Small cleanups

parent ec2f4983
Branches
No related tags found
No related merge requests found
...@@ -240,9 +240,10 @@ class OC_Calendar_Calendar{ ...@@ -240,9 +240,10 @@ class OC_Calendar_Calendar{
'#9fc6e7', // "light blue" '#9fc6e7', // "light blue"
); );
} }
public static function getEventSourceInfo($calendar){ public static function getEventSourceInfo($calendar){
return array( 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'], 'backgroundColor' => $calendar['calendarcolor'],
'borderColor' => '#888', 'borderColor' => '#888',
'textColor' => 'black', 'textColor' => 'black',
......
...@@ -83,7 +83,7 @@ class OC_Contacts_App { ...@@ -83,7 +83,7 @@ class OC_Contacts_App {
$vcard = OC_VObject::parse($card['carddata']); $vcard = OC_VObject::parse($card['carddata']);
// Try to fix cards with missing 'N' field from pre ownCloud 4. Hot damn, this is ugly... // Try to fix cards with missing 'N' field from pre ownCloud 4. Hot damn, this is ugly...
if(!is_null($vcard) && !$vcard->__isset('N')) { if(!is_null($vcard) && !$vcard->__isset('N')) {
$appinfo = $info=OC_App::getAppInfo('contacts'); $appinfo = OC_App::getAppInfo('contacts');
if($appinfo['version'] >= 5) { if($appinfo['version'] >= 5) {
OC_Log::write('contacts','OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OC_Log::DEBUG); OC_Log::write('contacts','OC_Contacts_App::getContactVCard. Deprecated check for missing N field', OC_Log::DEBUG);
} }
......
...@@ -29,7 +29,7 @@ class OC_Contacts_Hooks{ ...@@ -29,7 +29,7 @@ class OC_Contacts_Hooks{
* @param paramters parameters from postDeleteUser-Hook * @param paramters parameters from postDeleteUser-Hook
* @return array * @return array
*/ */
public function deleteUser($parameters) { static public function deleteUser($parameters) {
$addressbooks = OC_Contacts_Addressbook::all($parameters['uid']); $addressbooks = OC_Contacts_Addressbook::all($parameters['uid']);
foreach($addressbooks as $addressbook) { foreach($addressbooks as $addressbook) {
......
...@@ -213,7 +213,15 @@ class OC{ ...@@ -213,7 +213,15 @@ class OC{
} }
// set the right include path // 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 // Redirect to installer if not installed
if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') { if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment