Merge branch 'master' into wip_leon_T7975_caption_check_on_pasted_images

[Pman.Core] / Images.php

diff --git a/Images.php b/Images.php
index b383b9f..bcedb00 100644 (file)
--- a/Images.php
+++ b/Images.php
@@ -414,8 +414,6 @@ class Pman_Core_Images extends Pman
         }
         //var_dump($ff->Pman_Images['public_baseURL']);
         $baseURL = $ff->Pman_Images['public_baseURL'];
-        var_dumP($baseURL);
-        die('test');
         
         libxml_use_internal_errors(true);
         $dom = new DOMDocument();
@@ -507,15 +505,15 @@ class Pman_Core_Images extends Pman
         }
         
         $w =  is_string($dom) ? false : $dom->getAttribute('width');
-        $h =  is_string($dom) ? false : $dom->getAttribute('width');
+        $h =  is_string($dom) ? false : $dom->getAttribute('height');
         
-        if (!is_string($dom) && (!empty($w) || !empty($h)) )
+        if (!is_string($dom) && (!empty($w) || !empty($h) ) && is_numeric($w) && is_numeric($h))
         {
             // no support for %...
             $thumbsize =
-                (empty($w) ? '0' : $w * 1) .
+                (empty($w) ? '0' : intval($w) * 1) .
                 'x' .
-                (empty($h) ? '0' : $h * 1);
+                (empty($h) ? '0' : intval($h) * 1);
              $provider = '/Images/Thumb';
             
         }