summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorTom Needham <needham.thomas@gmail.com>2011-10-07 17:10:50 +0100
committerTom Needham <needham.thomas@gmail.com>2011-10-07 17:10:50 +0100
commit538abb99f1ee5d2a3b32ba4de134ac1de463a3b9 (patch)
tree3d6837350b442f438973e32348937ead5506af13 /lib
parent66db81309ba030e7e5f36dbdffec90e7fd32322e (diff)
parent1f562a2e83f106a637e402afae1697cf2936295a (diff)
downloadnextcloud-server-538abb99f1ee5d2a3b32ba4de134ac1de463a3b9.tar.gz
nextcloud-server-538abb99f1ee5d2a3b32ba4de134ac1de463a3b9.zip
Merge branch 'master' of gitorious.org:owncloud/owncloud into ace-editor
Diffstat (limited to 'lib')
-rw-r--r--lib/helper.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/helper.php b/lib/helper.php
index 9c2b5fc33ce..c2a81ba3306 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -101,20 +101,20 @@ class OC_Helper {
// Is it a dir?
if( $mimetype == "dir" ){
- return OC::$WEBROOT."/core/img/places/folder.svg";
+ return OC::$WEBROOT."/core/img/filetypes/folder.png";
}
// Icon exists?
- if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
- return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
+ if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+ return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
}
//try only the first part of the filetype
$mimetype=substr($mimetype,0,strpos($mimetype,'-'));
- if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.svg" )){
- return OC::$WEBROOT."/core/img/filetypes/$mimetype.svg";
+ if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+ return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
}
else{
- return OC::$WEBROOT."/core/img/filetypes/file.svg";
+ return OC::$WEBROOT."/core/img/filetypes/file.png";
}
}