diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-03-02 21:35:48 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-03-02 21:35:48 +0000 |
| commit | 45ef2ecf52abc58e5c21105345cb2b0560102939 (patch) | |
| tree | 9062ce6085c06c191146607aa8e1df8f3763c938 /apps/bookmarks/lib | |
| parent | 33c5b3a2efa8559a3e960e6d8256576aab604869 (diff) | |
| parent | 3e84f170e7133d9acc46123ba4c901a24e438b2c (diff) | |
| download | nextcloud-server-45ef2ecf52abc58e5c21105345cb2b0560102939.tar.gz nextcloud-server-45ef2ecf52abc58e5c21105345cb2b0560102939.zip | |
Fix merge conflict
Diffstat (limited to 'apps/bookmarks/lib')
| -rw-r--r-- | apps/bookmarks/lib/search.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/apps/bookmarks/lib/search.php b/apps/bookmarks/lib/search.php index 59495db82ea..235587855d9 100644 --- a/apps/bookmarks/lib/search.php +++ b/apps/bookmarks/lib/search.php @@ -20,8 +20,8 @@ * */ -class OC_Search_Provider_Bookmarks extends OC_Search_Provider{ - function search($query){ +class OC_Search_Provider_Bookmarks implements OC_Search_Provider{ + static function search($query){ $results=array(); $offset = 0; @@ -45,6 +45,3 @@ class OC_Search_Provider_Bookmarks extends OC_Search_Provider{ return $results; } } -new OC_Search_Provider_Bookmarks(); - -?> |