mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix merge conflicts

This commit is contained in:
Georg Ehrke 2013-07-30 12:35:39 +02:00
parent ac6a3133ec
commit d84d8f7108
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/template/functions.php
View File

@ -47,22 +47,6 @@ function image_path( $app, $image ) {
return OC_Helper::imagePath( $app, $image );
}
/**
* @brief make preview_icon available as a simple function
* Returns the path to the preview of the image.
* @param $path path of file
* @returns link to the preview
*
* For further information have a look at OC_Helper::previewIcon
*/
function preview_icon( $path ) {
return OC_Helper::previewIcon( $path );
}
function publicPreview_icon ( $path, $token ) {
return OC_Helper::publicPreviewIcon( $path, $token );
}
/**
* @brief make OC_Helper::mimetypeIcon available as a simple function
* @param string $mimetype mimetype
@ -87,7 +71,7 @@ function preview_icon( $path ) {
}
function publicPreview_icon ( $path, $token ) {
return OC_Helper::publicPreview_icon( $path, $token );
return OC_Helper::publicPreviewIcon( $path, $token );
}
/**