Index: core/units/helpers/image_helper.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- core/units/helpers/image_helper.php (revision 15775) +++ core/units/helpers/image_helper.php (revision ) @@ -43,25 +43,25 @@ $format_parts = explode(';', $format); foreach ($format_parts as $format_part) { - if (preg_match('/resize:(\d*)x(\d*)/', $format_part, $regs)) { + if (preg_match('/^resize:(\d*)x(\d*)$/', $format_part, $regs)) { $res['max_width'] = $regs[1]; $res['max_height'] = $regs[2]; } - elseif (preg_match('/wm:([^\|]*)\|([^\|]*)\|([^\|]*)/', $format_part, $regs)) { + elseif (preg_match('/^wm:([^\|]*)\|([^\|]*)\|([^\|]*)$/', $format_part, $regs)) { $res['wm_filename'] = FULL_PATH.THEMES_PATH.'/'.$regs[1]; $res['h_margin'] = strtolower($regs[2]); $res['v_margin'] = strtolower($regs[3]); } - elseif (preg_match('/crop:([^\|]*)\|([^\|]*)/', $format_part, $regs)) { + elseif (preg_match('/^crop:([^\|]*)\|([^\|]*)$/', $format_part, $regs)) { $res['crop_x'] = strtolower($regs[1]); $res['crop_y'] = strtolower($regs[2]); } elseif ($format_part == 'img_size' || $format_part == 'img_sizes') { $res['image_size'] = true; } - elseif (preg_match('/fill:(.*)/', $format_part, $regs)) { + elseif (preg_match('/^fill:(.*)$/', $format_part, $regs)) { $res['fill'] = $regs[1]; - } elseif (preg_match('/default:(.*)/', $format_part, $regs)) { + } elseif (preg_match('/^default:(.*)$/', $format_part, $regs)) { $res['default'] = FULL_PATH.THEMES_PATH.'/'.$regs[1]; } } \ No newline at end of file