diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-10-17 16:38:11 +0200 |
| commit | 6081bfa2bcbe121e373486273ecce58a49e6fa97 (patch) | |
| tree | f2504800c66919a53eff9323724b493079569495 /lib/search/provider | |
| parent | c2b4e534534e083147bbad9b564179832cfa2912 (diff) | |
| parent | 44287d680bd0e8799724a7595db43c0fafcaff40 (diff) | |
| download | nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.tar.gz nextcloud-server-6081bfa2bcbe121e373486273ecce58a49e6fa97.zip | |
Merge branch 'master' into routing
Conflicts:
lib/search/provider/file.php
settings/ajax/changepassword.php
settings/settings.php
Diffstat (limited to 'lib/search/provider')
| -rw-r--r-- | lib/search/provider/file.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php index e4e976ed7fd..6cd6ef78f2f 100644 --- a/lib/search/provider/file.php +++ b/lib/search/provider/file.php @@ -10,6 +10,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{ $name = basename($path); $text = ''; + $skip = false; if($mime=='httpd/unix-directory') { $link = OC_Helper::linkTo( 'files', 'index.php', array('dir' => $path)); $type = 'Files'; @@ -18,6 +19,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{ $mimeBase = $fileData['mimepart']; switch($mimeBase) { case 'audio': + $skip = true; break; case 'text': $type = 'Text'; @@ -33,7 +35,9 @@ class OC_Search_Provider_File extends OC_Search_Provider{ } } } - $results[] = new OC_Search_Result($name, $text, $link, $type); + if(!$skip) { + $results[] = new OC_Search_Result($name, $text, $link, $type); + } } return $results; } |