Agree on argument type (cleaned this time).

diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
index e98c282ef41cf709c901d1ac7a70b8405dd22eff..684eebf5fdd99f1a55eeb407f76a5933d2ff2d77 100644 (file)
--- 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 05a808a5ae0056d39424f757b6dafb1eff421ce5..eed4d98f1566362d8aade66d940cb93bda54748f 100644 (file)
--- a/apps/calendar/index.php
+++ b/apps/calendar/index.php
@@ -11,10 +11,10 @@ OCP\User::checkLoggedIn();
 OCP\App::checkAppEnabled('calendar');
 
 // Create 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(), 1);
+       $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true);
 }
 
 $eventSources = array();

diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 869b35e2e1b180a62145303e0720a91ff3e5bc6f..cde020293d4843f53350bf7d59642fcee4fae51d 100644 (file)
--- 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){
                        $active_where = ' AND active = ?';
                        $values[] = $active;
                }

diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
index 03516b3b70c31007987fc70cb1a1f8cddfa7f300..6526b4223ac53e5513b52a93079c541e1c32d286 100644 (file)
--- 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;
                }