aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2012-02-07 22:33:01 +0100
committerBart Visscher <bartv@thisnet.nl>2012-02-08 21:12:30 +0100
commiteb5de4d4f7b98bb1c258dbb5ed5ecf9c2d39e746 (patch)
tree47ae2ac83a8241730c1070ce582564064c778839 /lib
parent7c03b612d2c58f9cc02c46c82e137087b1591d07 (diff)
downloadnextcloud-server-eb5de4d4f7b98bb1c258dbb5ed5ecf9c2d39e746.tar.gz
nextcloud-server-eb5de4d4f7b98bb1c258dbb5ed5ecf9c2d39e746.zip
Change gallery thumbnail generation to OC_Image
Diffstat (limited to 'lib')
-rw-r--r--lib/image.php6
-rw-r--r--lib/util.php2
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/image.php b/lib/image.php
index 6de3ed9104d..255d289ea21 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -147,6 +147,10 @@ class OC_Image {
return false;
}
}
+ if (!$this->valid()) {
+ return false;
+ }
+
$retval = false;
switch(self::$imagetype) {
case IMAGETYPE_GIF:
@@ -257,7 +261,7 @@ class OC_Image {
$flip = true;
break;
case 8:
- $rotate = 270;
+ $rotate = 90;
$flip = false;
break;
}
diff --git a/lib/util.php b/lib/util.php
index abd918044b5..43fb4413f04 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -110,7 +110,7 @@ class OC_Util {
/**
* @brief Add a custom element to the header
* @param string tag tag name of the element
- * @param array $attributes array of attrobutes for the element
+ * @param array $attributes array of attributes for the element
* @param string $text the text content for the element
*/
public static function addHeader( $tag, $attributes, $text=''){