diff options
author | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
---|---|---|
committer | Thomas Tanghus <thomas@tanghus.net> | 2012-11-04 12:31:06 +0100 |
commit | e6a7bba0950688d73f52cd622bdf6ec62dff9281 (patch) | |
tree | aec719c0af896e1f47c0475f13ed2355dbf34f4f /lib/search.php | |
parent | 8e5b6bf21d14b6022e543869cba503bb582b1cb5 (diff) | |
parent | 17d466b03b91ccc058fe1a88340df36c22a580c2 (diff) | |
download | nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.tar.gz nextcloud-server-e6a7bba0950688d73f52cd622bdf6ec62dff9281.zip |
Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
lib/vcategories.php
Diffstat (limited to 'lib/search.php')
-rw-r--r-- | lib/search.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/search.php b/lib/search.php index 0b6ad050024..2629c5e2fbe 100644 --- a/lib/search.php +++ b/lib/search.php @@ -40,7 +40,7 @@ class OC_Search{ * register a new search provider to be used * @param string $provider class name of a OC_Search_Provider */ - public static function registerProvider($class,$options=array()) { + public static function registerProvider($class, $options=array()) { self::$registeredProviders[]=array('class'=>$class,'options'=>$options); } |