summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gapczynski <mtgap@owncloud.com>2012-06-26 14:48:51 -0400
committerMichael Gapczynski <mtgap@owncloud.com>2012-06-26 14:51:31 -0400
commitf55f13eebc3c3f15e74a7026a058ffaa5079f0e3 (patch)
tree7218d106eedfb5a9e3b615f708b99364373b4776
parentcad282b73f48b696e078c38abde3e3ec1bea691f (diff)
downloadnextcloud-server-f55f13eebc3c3f15e74a7026a058ffaa5079f0e3.tar.gz
nextcloud-server-f55f13eebc3c3f15e74a7026a058ffaa5079f0e3.zip
Don't call getLocalFile() until you know it actually is music
-rw-r--r--apps/media/lib_scanner.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
index a8218c3a4d0..3c32879eeeb 100644
--- a/apps/media/lib_scanner.php
+++ b/apps/media/lib_scanner.php
@@ -61,7 +61,6 @@ class OC_MEDIA_SCANNER{
* @return boolean
*/
public static function scanFile($path){
- $file=OC_Filesystem::getLocalFile($path);
if(!self::isMusic($path)){
return;
}
@@ -69,6 +68,7 @@ class OC_MEDIA_SCANNER{
self::$getID3=@new getID3();
self::$getID3->encoding='UTF-8';
}
+ $file=OC_Filesystem::getLocalFile($path);
$data=@self::$getID3->analyze($file);
getid3_lib::CopyTagsToComments($data);
if(!isset($data['comments'])){