merged fix for MDL-7270, fixing warnings

diff --git a/mod/data/field/picture/field.class.php b/mod/data/field/picture/field.class.php
index 9f3a568a7fda8447cdf9fcdd78bd733007f4de2e..847668ac994a30baa73138eecef8924966fbe301 100755 (executable)
--- a/mod/data/field/picture/field.class.php
+++ b/mod/data/field/picture/field.class.php
@@ -203,9 +203,9 @@ class data_field_picture extends data_field_file {
                 break;
         }
 
-        
-        $thumbwidth  = $this->field->param4;
-        $thumbheight = $this->field->param5;
+        // fix for MDL-7270
+        $thumbwidth  = isset($this->field->param4)?$this->field->param4:'';
+        $thumbheight = isset($this->field->param5)?$this->field->param5:'';
         
         if ($thumbwidth || $thumbheight) { // Only if either width OR height specified do we want a thumbnail