Changeset 958291

Timestamp:

07/31/2014 08:17:07 PM (12 years ago)

Author:

zubaka

Message:

Get rid limit of preg_replace() problems by exact number of expected replaces

Location:

zbplayer/trunk

Files:

• readme.txt (modified) (2 diffs)
• zbPlayer.admin.php (modified) (1 diff)
• zbPlayer.php (modified) (3 diffs)

zbplayer/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.5
 Tested up to: 3.9.1
-Stable tag: 2.1.6
+Stable tag: 2.1.7
 License: Dual Licensed under the MIT and GPLv2 or later
 
@@ -51 +51 @@
 
 == Changelog ==
+
+= 2.1.7 =
+*    Get rid limit of preg_replace() problems by exact number of expected replaces
 
 = 2.1.6 =

zbplayer/trunk/zbPlayer.admin.php

@@ -7 +7 @@
  *
  *  zbPlayer.admin.php
- *  Release 2.1.6 July 2014
+ *  Release 2.1.7 July 2014
  */
 // connect wordpress color picker

zbplayer/trunk/zbPlayer.php

@@ -4 +4 @@
 Plugin URI: http://gilevich.com/portfolio/zbplayer
 Description: Converts mp3 files links to a small flash player and a link to download file mp3 file. Also you can share your mp3 files with that plugin.
-Version: 2.1.6
+Version: 2.1.7
 Author: Vladimir Gilevich
 Author URI: http://gilevich.com/
@@ -10 +10 @@
 */
 
-define('ZBPLAYER_VERSION', "2.1.6");
+define('ZBPLAYER_VERSION', "2.1.7");
 define('ZBPLAYER_DEFAULT_WIDTH', "500");
 define('ZBPLAYER_DEFAULT_INITIALVOLUME', "60");
@@ -120 +120 @@
             }
         } else {
-            $result = preg_replace_callback( $pattern, "zbp_insert_player", $content );
+            // let's try find exact value or expected replaces to do not have limit problems with preg_replace()
+            preg_match_all( $pattern, $content, $matches );
+            $expectedReplaces = (is_array($matches) && count($matches)) ? count($matches[0]) : -1;
+            $result = preg_replace_callback( $pattern, "zbp_insert_player", $content, $expectedReplaces );
             // fix if error occured for preg_replace_callback()
             $content = empty($result) ? $content : $result;