Changeset 1534 for trunk/Assetylene

Timestamp:

05/24/09 23:52:58 (6 months ago)

Author:

breese

Message:

improved some regexes so they are less greedy

Location:

trunk/Assetylene

Files:

• Makefile.PL (modified) (1 diff)
• plugins/Assetylene/config.yaml (modified) (1 diff)
• plugins/Assetylene/lib/Assetylene/CMS.pm (modified) (1 diff)

trunk/Assetylene/Makefile.PL

@@ -3 +3 @@
 WriteMakefile(
     NAME            => 'Assetylene',
-    VERSION         => '1.01',
+    VERSION         => '1.02',
     DISTNAME        => 'Assetylene',
 );

trunk/Assetylene/plugins/Assetylene/config.yaml

@@ -1 +1 @@
 name: Assetylene
 description: Provides a new "Caption" field when inserting an asset into a post, and the ability to customize the HTML markup produced for publishing MT assets.
-version: 1.01
+version: 1.02
 author_name: Six Apart Ltd.
 author_link: http://www.sixapart.com/

trunk/Assetylene/plugins/Assetylene/lib/Assetylene/CMS.pm

@@ -92 +92 @@
 
     $param->{form_tag} = $form_tag;
-    ($param->{form_style}) = $form_tag =~ /\bstyle="(.+?)"/s;
-    ($param->{form_class}) = $form_tag =~ /\bclass="(.+?)"/s;
+    ($param->{form_style}) = $form_tag =~ /\bstyle="([^\"]+)"/s;
+    ($param->{form_class}) = $form_tag =~ /\bclass="([^\"]+)"/s;
 
     $param->{img_tag} = $img_tag;
     ($param->{img_height}) = $img_tag =~ /\bheight="(\d+)"/;
     ($param->{img_width}) = $img_tag =~ /\bwidth="(\d+)"/;
-    ($param->{img_src}) = $img_tag =~ /\bsrc="(.+)?"/s;
-    ($param->{img_style}) = $img_tag =~ /\bstyle="(.+?)"/s;
-    ($param->{img_class}) = $img_tag =~ /\bclass="(.+?)"/s;
-    ($param->{img_alt}) = $img_tag =~ /\balt="(.+?)"/s;
+    ($param->{img_src}) = $img_tag =~ /\bsrc="([^\"]+)"/s;
+    ($param->{img_style}) = $img_tag =~ /\bstyle="([^\"]+)"/s;
+    ($param->{img_class}) = $img_tag =~ /\bclass="([^\"]+)"/s;
+    ($param->{img_alt}) = $img_tag =~ /\balt="([^\"]+)"/s;
 
     $insert_tmpl->param( $param );