Changeset 1994

Timestamp:

12/23/2004 12:08:43 AM (21 years ago)

Author:

saxmatt

Message:

Clean up global ideas from michel_v

Location:

trunk

Files:

• wp-admin/bookmarklet.php (modified) (1 diff)
• wp-includes/functions-formatting.php (modified) (2 diffs)
• wp-includes/vars.php (modified) (2 diffs)

trunk/wp-admin/bookmarklet.php

@@ -21 +21 @@
 <?php
 } else {
-    $popuptitle = wp_specialchars(stripslashes($popuptitle));
-    $text = wp_specialchars(stripslashes(urldecode($text)));
-    
-    /* big funky fixes for browsers' javascript bugs */
-    
-    if (($is_macIE) && (!isset($IEMac_bookmarklet_fix))) {
-        $popuptitle = preg_replace('/'.$wp_macIE_correction["in"].'/','/'.$wp_macIE_correction["out"].'/',$popuptitle);
-        $text = preg_replace('/'.$wp_macIE_correction["in"].'/','/'.$wp_macIE_correction["out"].'/',$text);
-    }
-    
-    if (($is_winIE) && (!isset($IEWin_bookmarklet_fix))) {
-        $popuptitle =  preg_replace("/\%u([0-9A-F]{4,4})/e",  "'&#'.base_convert('\\1',16,10).';'", $popuptitle);
-        $text =  preg_replace("/\%u([0-9A-F]{4,4})/e",  "'&#'.base_convert('\\1',16,10).';'", $text);
-    }
-    
-    if (($is_gecko) && (!isset($Gecko_bookmarklet_fix))) {
-        $popuptitle = preg_replace('/'.$wp_gecko_correction["in"].'/','/'.$wp_gecko_correction["out"].'/',$popuptitle);
-        $text = preg_replace('/'.$wp_gecko_correction["in"].'/','/'.$wp_gecko_correction["out"].'/',$text);
-    }
-    
-    $post_title = wp_specialchars($_REQUEST['post_title']);
-    if (!empty($post_title)) {
-        $post_title =  stripslashes($post_title);
-    } else {
-        $post_title = $popuptitle;
-    }
-
-    $edited_post_title = wp_specialchars($post_title);
+    $popuptitle = wp_specialchars(stripslashes($popuptitle));
+    $text       = wp_specialchars(stripslashes(urldecode($text)));
+    
+    $popuptitle = funky_javascript_fix($popuptitle);
+    $text       = funky_javascript_fix($text);
+    
+    $post_title = wp_specialchars($_REQUEST['post_title']);
+    if (!empty($post_title)) {
+        $post_title =  stripslashes($post_title);
+    } else {
+        $post_title = $popuptitle;
+    }
+    
+    $edited_post_title = wp_specialchars($post_title);
 
 // $post_pingback needs to be set in any file that includes edit-form.php

trunk/wp-includes/functions-formatting.php

@@ -237 +237 @@
 
 function convert_chars($content, $flag = 'obsolete') { 
-    global $wp_htmltranswinuni;
+    // Translation of invalid Unicode references range to valid range
+    $wp_htmltranswinuni = array(
+    '€' => '€', // the Euro sign
+    '' => '',
+    '‚' => '‚', // these are Windows CP1252 specific characters
+    'ƒ' => 'ƒ',  // they would look weird on non-Windows browsers
+    '„' => '„',
+    '…' => '…',
+    '†' => '†',
+    '‡' => '‡',
+    'ˆ' => 'ˆ',
+    '‰' => '‰',
+    'Š' => 'Š',
+    '‹' => '‹',
+    'Œ' => 'Œ',
+    '' => '',
+    'Ž' => 'ž',
+    '' => '',
+    '' => '',
+    '‘' => '‘',
+    '’' => '’',
+    '“' => '“',
+    '”' => '”',
+    '•' => '•',
+    '–' => '–',
+    '—' => '—',
+    '˜' => '˜',
+    '™' => '™',
+    'š' => 'š',
+    '›' => '›',
+    'œ' => 'œ',
+    '' => '',
+    'ž' => '',
+    'Ÿ' => 'Ÿ'
+    );
 
     // Remove metadata tags
@@ -254 +288 @@
 
     return $content;
+}
+
+function funky_javascript_fix($text) {
+    // Fixes for browsers' javascript bugs
+    global $is_macIE, $is_winIE, $is_gecko;
+    $wp_macIE_correction['in'] = array(
+        '/\%uFFD4/', '/\%uFFD5/', '/\%uFFD2/', '/\%uFFD3/',
+        '/\%uFFA5/', '/\%uFFD0/', '/\%uFFD1/', '/\%uFFBD/',
+        '/\%uFF83%uFFC0/', '/\%uFF83%uFFC1/', '/\%uFF83%uFFC6/', '/\%uFF83%uFFC9/',
+        '/\%uFFB9/', '/\%uFF81%uFF8C/', '/\%uFF81%uFF8D/', '/\%uFF81%uFFDA/',
+        '/\%uFFDB/'
+    );
+    $wp_macIE_correction['out'] = array(
+        '‘', '’', '“', '”',
+        '•', '–', '—', 'Ω',
+        'β', 'γ', 'θ', 'λ',
+        'π', '′', '″', '∠',
+        '€'
+    );
+    $wp_gecko_correction['in'] = array(
+        '/\‘/', '/\’/', '/\“/', '/\”/',
+        '/\•/', '/\–/', '/\—/', '/\O/',
+        '/\ß/', '/\?/', '/\?/', '/\?/',
+        '/\p/', '/\'/', '/\?/', '/\/',
+        '/\€/', '/\?/'
+    );
+    $wp_gecko_correction['out'] = array(
+        '&8216;', '’', '“', '”',
+        '•', '–', '—', 'Ω',
+        'β', 'γ', 'θ', 'λ',
+        'π', '′', '″', '∠',
+        '€', ' '
+    );
+    if ( $is_macIE )
+        $text = preg_replace('/'.$wp_macIE_correction["in"].'/', '/'.$wp_macIE_correction["out"].'/', $text);
+    
+    if ( $is_winIE )
+        $text =  preg_replace("/\%u([0-9A-F]{4,4})/e",  "'&#'.base_convert('\\1',16,10).';'", $text);
+    
+    if ( $is_gecko )
+        $text = preg_replace('/'.$wp_gecko_correction["in"].'/','/'.$wp_gecko_correction["out"].'/',$text);
+    
+    return $text;
 }
 

trunk/wp-includes/vars.php

@@ -3 +3 @@
 /* This file sets various arrays and variables for use in WordPress */
 require(ABSPATH . 'wp-includes/version.php');
-
-# Translation of invalid Unicode references range to valid range
-$wp_htmltranswinuni = array(
-    '€' => '€', // the Euro sign
-    '' => '',
-    '‚' => '‚', // these are Windows CP1252 specific characters
-    'ƒ' => 'ƒ',  // they would look weird on non-Windows browsers
-    '„' => '„',
-    '…' => '…',
-    '†' => '†',
-    '‡' => '‡',
-    'ˆ' => 'ˆ',
-    '‰' => '‰',
-    'Š' => 'Š',
-    '‹' => '‹',
-    'Œ' => 'Œ',
-    '' => '',
-    'Ž' => 'ž',
-    '' => '',
-    '' => '',
-    '‘' => '‘',
-    '’' => '’',
-    '“' => '“',
-    '”' => '”',
-    '•' => '•',
-    '–' => '–',
-    '—' => '—',
-    '˜' => '˜',
-    '™' => '™',
-    'š' => 'š',
-    '›' => '›',
-    'œ' => 'œ',
-    '' => '',
-    'ž' => '',
-    'Ÿ' => 'Ÿ'
-    );
 
 // On which page are we ?
@@ -75 +39 @@
 }
 $is_IE    = (($is_macIE) || ($is_winIE));
-
-// browser-specific javascript corrections
-$wp_macIE_correction['in'] = array(
-    '/\%uFFD4/', '/\%uFFD5/', '/\%uFFD2/', '/\%uFFD3/',
-    '/\%uFFA5/', '/\%uFFD0/', '/\%uFFD1/', '/\%uFFBD/',
-    '/\%uFF83%uFFC0/', '/\%uFF83%uFFC1/', '/\%uFF83%uFFC6/', '/\%uFF83%uFFC9/',
-    '/\%uFFB9/', '/\%uFF81%uFF8C/', '/\%uFF81%uFF8D/', '/\%uFF81%uFFDA/',
-    '/\%uFFDB/'
-);
-$wp_macIE_correction['out'] = array(
-    '‘', '’', '“', '”',
-    '•', '–', '—', 'Ω',
-    'β', 'γ', 'θ', 'λ',
-    'π', '′', '″', '∠',
-    '€'
-);
-$wp_gecko_correction['in'] = array(
-    '/\‘/', '/\’/', '/\“/', '/\”/',
-    '/\•/', '/\–/', '/\—/', '/\Ω/',
-    '/\β/', '/\γ/', '/\θ/', '/\λ/',
-    '/\π/', '/\′/', '/\″/', '/\/',
-    '/\€/', '/\ /'
-);
-$wp_gecko_correction['out'] = array(
-    '&8216;', '’', '“', '”',
-    '•', '–', '—', 'Ω',
-    'β', 'γ', 'θ', 'λ',
-    'π', '′', '″', '∠',
-    '€', ' '
-);
 
 // Server detection