plugins/calendar

Thomas Brüderli bruederli at kolabsys.com
Tue Feb 24 17:36:13 CET 2015


 plugins/calendar/drivers/kolab/kolab_calendar.php |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c1b6803ae2afec3d06447c2413fd06298431e3b9
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Feb 24 17:36:04 2015 +0100

    Don't call private methods from an anonymous function. Context is not preserved in PHP 5.3 (#4702)

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index 4bf064f..faa92d2 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -327,7 +327,7 @@ class kolab_calendar extends kolab_storage_folder_api
       if (count($words)) {
         $hits = 0;
         foreach ($words as $word) {
-          $hits += $me->_fulltext_match($event, $word, false);
+          $hits += $me->fulltext_match($event, $word, false);
         }
         if ($hits < count($words)) {
           return false;
@@ -735,7 +735,7 @@ class kolab_calendar extends kolab_storage_folder_api
   /**
    * Match the given word in the event contents
    */
-  private function _fulltext_match($event, $word, $recursive = true)
+  public function fulltext_match($event, $word, $recursive = true)
   {
     $hits = 0;
     foreach ($this->search_fields as $col) {
@@ -754,7 +754,7 @@ class kolab_calendar extends kolab_storage_folder_api
     // search in recurrence exceptions
     if (!$hits && $recursive && !empty($event['recurrence']['EXCEPTIONS'])) {
       foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {
-        $hits = $this->_fulltext_match($exception, $word, false);
+        $hits = $this->fulltext_match($exception, $word, false);
         if ($hits) break;
       }
     }




More information about the commits mailing list