Merge pull request #5276 from owncloud/fixing-5170-master
only text/plain is now used to generate text previews
This commit is contained in:
commit
04783da829
|
@ -9,20 +9,19 @@ namespace OC\Preview;
|
|||
|
||||
class TXT extends Provider {
|
||||
|
||||
private static $blacklist = array(
|
||||
'text/calendar',
|
||||
'text/vcard',
|
||||
);
|
||||
|
||||
public function getMimeType() {
|
||||
return '/text\/.*/';
|
||||
return '/text\/plain/';
|
||||
}
|
||||
|
||||
/**
|
||||
* @param string $path
|
||||
* @param int $maxX
|
||||
* @param int $maxY
|
||||
* @param boolean $scalingup
|
||||
* @param \OC\Files\View $fileview
|
||||
* @return bool|\OC_Image
|
||||
*/
|
||||
public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
|
||||
$mimetype = $fileview->getMimeType($path);
|
||||
if(in_array($mimetype, self::$blacklist)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
$content = $fileview->fopen($path, 'r');
|
||||
$content = stream_get_contents($content);
|
||||
|
@ -62,22 +61,12 @@ class TXT extends Provider {
|
|||
|
||||
\OC\Preview::registerProvider('OC\Preview\TXT');
|
||||
|
||||
class PHP extends TXT {
|
||||
class MarkDown extends TXT {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/x-php/';
|
||||
return '/text\/(x-)?markdown/';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\PHP');
|
||||
|
||||
class JavaScript extends TXT {
|
||||
|
||||
public function getMimeType() {
|
||||
return '/application\/javascript/';
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
\OC\Preview::registerProvider('OC\Preview\JavaScript');
|
||||
\OC\Preview::registerProvider('OC\Preview\MarkDown');
|
||||
|
|
Loading…
Reference in New Issue