From 0f6b1be0e6f0cc6ff97c97190c7da67f5fee0294 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 00:50:42 +0200
Subject: [PATCH] Agree on argument type.
---
apps/calendar/ajax/import/dropimport.php | 2 +-
apps/calendar/index.php | 10 +++++-----
apps/calendar/lib/calendar.php | 6 +++---
apps/calendar/lib/search.php | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index e98c282ef4..684eebf5fd 100644
--- a/apps/calendar/ajax/import/dropimport.php
+++ b/apps/calendar/ajax/import/dropimport.php
@@ -45,7 +45,7 @@ foreach($lines as $line) {
}
$i++;
}
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
$id = $calendars[0]['id'];
foreach($uids as $uid) {
$prefix=$suffix=$content=array();
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
index 05a808a5ae..a74c879436 100644
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -11,11 +11,11 @@ OCP\User::checkLoggedIn();
OCP\App::checkAppEnabled('calendar');
// Create default calendar ...
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
-if( count($calendars) == 0){
- OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar');
- $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
-}
+$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
+// if( count($calendars) == 0){
+// OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar');
+// $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
+// }
$eventSources = array();
foreach($calendars as $calendar){
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 869b35e2e1..dfd8fe7437 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -44,13 +44,13 @@ class OC_Calendar_Calendar{
/**
* @brief Returns the list of calendars for a specific user.
* @param string $uid User ID
- * @param boolean $active Only return calendars with this $active state, default(=null) is don't care
+ * @param boolean $active Only return calendars with this $active state, default(=false) is don't care
* @return array
*/
- public static function allCalendars($uid, $active=null){
+ public static function allCalendars($uid, $active=false){
$values = array($uid);
$active_where = '';
- if (!is_null($active) && $active){
+ if ($active === true){
$active_where = ' AND active = ?';
$values[] = $active;
}
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 03516b3b70..6526b4223a 100644
--- a/apps/calendar/lib/search.php
+++ b/apps/calendar/lib/search.php
@@ -1,7 +1,7 @@
<?php
class OC_Search_Provider_Calendar extends OC_Search_Provider{
function search($query){
- $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), 1);
+ $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
if(count($calendars)==0 || !OCP\App::isEnabled('calendar')){
//return false;
}
--
GitLab