Changeset 1816 for trunk/system/libraries/Validation.php

Timestamp:

01/25/2008 04:08:12 PM (12 months ago)

Author:

Geert

Message:

• Small regex optimization (non-capturing parentheses now).
  
• Updating validation translation.
  

Files:

• trunk/system/libraries/Validation.php (modified) (1 diff)

trunk/system/libraries/Validation.php

@@ -505 +505 @@
                         foreach($params as $param)
                         {
-                                if (preg_match('/[0-9]+x[0-9]+(-[0-9]+x[0-9]+)?/', $param))
-                                {
-                                        // Image size, eg: 200x100 , 20x10-200x100
-                                        $param = (strpos($param, '-') === False) ? $param.'-'.$param : $param;
+                                if (preg_match('/[0-9]+x[0-9]+(?:-[0-9]+x[0-9]+)?/', $param))
+                                {
+                                        // Image size, eg: 200x100, 20x10-200x100
+                                        $param = (strpos($param, '-') === FALSE) ? $param.'-'.$param : $param;
 
                                         list($min, $max) = explode('-', $param);