diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php index 1f03901a0..4c2b014aa 100644 --- a/e107_handlers/e_parse_class.php +++ b/e107_handlers/e_parse_class.php @@ -2443,7 +2443,7 @@ class e_parse extends e_parser { $parm = $width; $multiply = $width['size']; - $encode = $width['x']; + $encode = (!empty($width['x'])) ? $width['x'] : false; $width = $width['size']; } @@ -2495,6 +2495,16 @@ class e_parse extends e_parser $parm['ah'] = null; } + if(!isset($parm['x'])) + { + $parm['x'] = null; + } + + if(!isset($parm['crop'])) + { + $parm['crop'] = null; + } + $parms = array('w'=>$width,'h'=>$height,'crop'=> $parm['crop'],'x'=>$parm['x'], 'aw'=>$parm['aw'],'ah'=>$parm['ah']); // $parms = !empty($this->thumbCrop) ? array('aw' => $width, 'ah' => $height, 'x'=>$encode) : array('w' => $width, 'h' => $height, 'x'=>$encode ); diff --git a/e107_handlers/mysql_class.php b/e107_handlers/mysql_class.php index 6c3286ead..15006b2db 100644 --- a/e107_handlers/mysql_class.php +++ b/e107_handlers/mysql_class.php @@ -1193,7 +1193,7 @@ class e_db_mysql // $result = ($this->pdo) ? $result : mysql_affected_rows($this->mySQLaccess); $this->dbError('db_Update'); - if ($result == -1) { return false; } // Error return from mysql_affected_rows + if ($result === -1) { return false; } // Error return from mysql_affected_rows return $result; } else diff --git a/e107_plugins/banner/e_shortcode.php b/e107_plugins/banner/e_shortcode.php index 8aab2ffac..425f0bdb4 100644 --- a/e107_plugins/banner/e_shortcode.php +++ b/e107_plugins/banner/e_shortcode.php @@ -85,6 +85,7 @@ class banner_shortcodes extends e_shortcode if($row['banner_image'][0] == '{') { $src = $row['banner_image']; + $style = ''; } else {