@@ -3,7 +3,7 @@ Plugin Name: ScreenSteps Live Plugin URI: http://screensteps.com/blog/2008/07/screensteps-live-wordpress-plugin/ Description: This plugin will incorporate lessons from your ScreenSteps Live account into your WordPress Pages. -Version: 1.0.7 +Version: 1.0.8 Author: Blue Mango Learning Systems Author URI: http://www.screensteps.com */ @@ -342,10 +342,11 @@ function screenstepslive_listPages($the_output) { if (empty($the_title) || $the_title == $post->post_title) { return ($the_output); } else { - // Now rename the page in the list to the original post title - $theNewOutput = preg_replace('/>' . preg_quote($the_title, "/") . '\</', '>' . $post->post_title . '<', $the_output, -1, $count); - if ($count > 0) return $theNewOutput; - else return ($the_output); + // Now rename the page in the list to the original post title + if ( preg_match( '/>' . preg_quote($the_title, "/") . '\</', $the_output, $matches, PREG_OFFSET_CAPTURE) ) { + $the_output = substr_replace( $the_output, '>' . $post->post_title . '<', $matches[0][1], strlen($matches[0][0]) ); + } + return ($the_output); } } @@ -568,7 +569,14 @@ function screenstepslive_parseContent($the_content) } } - if ($text != '') $the_content = preg_replace('/{{SCREENSTEPSLIVE_CONTENT}}/i', $text, $the_content); + if ($text != '') { + // case insensitive search/replace in PHP 5. preg_replace breaks if + // $1 or \\1 is in the string. This is the happy compromise. + if ( preg_match( '/{{SCREENSTEPSLIVE_CONTENT}}/i', $the_content, $matches, PREG_OFFSET_CAPTURE) ) { + $the_content = substr_replace( $the_content, $text, $matches[0][1], strlen($matches[0][0]) ); + } + //$the_content = preg_replace('/{{SCREENSTEPSLIVE_CONTENT}}/i', $text, $the_content); + } return $the_content; } screenstepslive.php ed0c3152942518cbf4f64080bb2e08bf44ec8ce8 Trevor K DeVore trevordevore@Trevors-iMac-2.home http://github.com/bluemango/screensteps-live-wordpress-plugin/commit/1ce4732d9d0fb085cbbe62419a44e592397b0d7b 1ce4732d9d0fb085cbbe62419a44e592397b0d7b 2009-10-08T09:32:33-07:00 2009-10-08T09:32:33-07:00 got rid of preg_match. lesson content could contain backreference syntax even though we don't want backreferences. 5f7b2709f7b9f201ca6a333ef97d54f1e386410a Trevor K DeVore trevordevore@Trevors-iMac-2.home