Changeset 10856

Timestamp:

04/01/2009 05:45:28 AM (17 years ago)

Author:

markjaquith

Message:

preg_quote2() unnecessary. preg_quote() supports delimiter escaping if you pass it as second param

File:

• trunk/wp-admin/press-this.php (modified) (2 diffs)

trunk/wp-admin/press-this.php

@@ -12 +12 @@
 
 if ( ! current_user_can('edit_posts') ) wp_die( __( 'Cheatin’ uh?' ) );
-
-/**
- * Replace forward slash with backslash and slash.
- *
- * @package WordPress
- * @subpackage Press_This
- * @since 2.6.0
- *
- * @param string $string
- * @return string
- */
-function preg_quote2($string) {
-    return str_replace('/', '\/', preg_quote($string));
-}
 
 /**
@@ -72 +58 @@
                 
                 // Replace the POSTED content <img> with correct uploaded ones. Regex contains fix for Magic Quotes
-                if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote2($image).'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
+                if( !is_wp_error($upload) ) $content = preg_replace('/<img ([^>]*)src=\\\?(\"|\')'.preg_quote($image, '/').'\\\?(\2)([^>\/]*)\/*>/is', $upload, $content);
             }