Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Thomas Bruederli 2015-02-24 17:36:04 +01:00
parent 2a5e28a377
commit c1b6803ae2
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -327,7 +327,7 @@ class kolab_calendar extends kolab_storage_folder_api
if (count($words)) { if (count($words)) {
$hits = 0; $hits = 0;
foreach ($words as $word) { foreach ($words as $word) {
$hits += $me->_fulltext_match($event, $word, false); $hits += $me->fulltext_match($event, $word, false);
} }
if ($hits < count($words)) { if ($hits < count($words)) {
return false; return false;
@ -735,7 +735,7 @@ class kolab_calendar extends kolab_storage_folder_api
/** /**
* Match the given word in the event contents * 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; $hits = 0;
foreach ($this->search_fields as $col) { foreach ($this->search_fields as $col) {
@ -754,7 +754,7 @@ class kolab_calendar extends kolab_storage_folder_api
// search in recurrence exceptions // search in recurrence exceptions
if (!$hits && $recursive && !empty($event['recurrence']['EXCEPTIONS'])) { if (!$hits && $recursive && !empty($event['recurrence']['EXCEPTIONS'])) {
foreach ($event['recurrence']['EXCEPTIONS'] as $exception) { foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {
$hits = $this->_fulltext_match($exception, $word, false); $hits = $this->fulltext_match($exception, $word, false);
if ($hits) break; if ($hits) break;
} }
} }