diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-03-07 21:49:46 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-03-07 21:49:46 +0100 |
| commit | 9908adb320171c0a12fa7d78964b5ddc3527f9fd (patch) | |
| tree | 06544ba73bced1ddc104cb2bf87e3c7672c026ad /lib/search.php | |
| parent | faf6055baa224fbf4248a70d28ae4416c9c7eb1c (diff) | |
| parent | d8cfe77ba5348d29a9e2b046e2c7efc1dd4758cb (diff) | |
| download | nextcloud-server-9908adb320171c0a12fa7d78964b5ddc3527f9fd.tar.gz nextcloud-server-9908adb320171c0a12fa7d78964b5ddc3527f9fd.zip | |
Merge branch 'master' into vcategories
Conflicts:
apps/contacts/lib/vcard.php
Diffstat (limited to 'lib/search.php')
| -rw-r--r-- | lib/search.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/search.php b/lib/search.php index f6f805bfe65..6b33fa38140 100644 --- a/lib/search.php +++ b/lib/search.php @@ -29,7 +29,7 @@ class OC_Search{ /** * register a new search provider to be used - * @param OC_Search_Provider $provider + * @param string $provider class name of a OC_Search_Provider */ public static function registerProvider($provider){ self::$providers[]=$provider; @@ -43,7 +43,7 @@ class OC_Search{ public static function search($query){ $results=array(); foreach(self::$providers as $provider){ - $results=array_merge($results,$provider->search($query)); + $results=array_merge($results, $provider::search($query)); } return $results; } |