Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- C:/wamp/www/drupal.pure/www/includes/common.inc.bak Ср май 25 23:43:56 2011
- +++ C:/wamp/www/drupal.pure/www/includes/common.inc Пт май 27 12:15:19 2011
- @@ -2497,9 +2497,64 @@
- return $var;
- case 'resource':
- case 'string':
- - return '"'. str_replace(array("\r", "\n", "<", ">", "&"),
- - array('\r', '\n', '\x3c', '\x3e', '\x26'),
- - addslashes($var)) .'"';
- +
- + static $replace_pairs;
- +
- + if (!isset($replace_pairs)) {
- + // Always use Unicode escape sequences (\u0022) over JSON escape
- + // sequences (\") to prevent browsers interpreting these as
- + // special characters.
- + $replace_pairs = array(
- + // ", \ and U+0000 - U+001F must be escaped according to RFC 4627.
- + '\\' => '\u005c',
- + '"' => '\u0022',
- + "\x00" => '\u0000',
- + "\x01" => '\u0001',
- + "\x02" => '\u0002',
- + "\x03" => '\u0003',
- + "\x04" => '\u0004',
- + "\x05" => '\u0005',
- + "\x06" => '\u0006',
- + "\x07" => '\u0007',
- + "\x08" => '\u0008',
- + "\x09" => '\u0009',
- + "\x0a" => '\u000a',
- + "\x0b" => '\u000b',
- + "\x0c" => '\u000c',
- + "\x0d" => '\u000d',
- + "\x0e" => '\u000e',
- + "\x0f" => '\u000f',
- + "\x10" => '\u0010',
- + "\x11" => '\u0011',
- + "\x12" => '\u0012',
- + "\x13" => '\u0013',
- + "\x14" => '\u0014',
- + "\x15" => '\u0015',
- + "\x16" => '\u0016',
- + "\x17" => '\u0017',
- + "\x18" => '\u0018',
- + "\x19" => '\u0019',
- + "\x1a" => '\u001a',
- + "\x1b" => '\u001b',
- + "\x1c" => '\u001c',
- + "\x1d" => '\u001d',
- + "\x1e" => '\u001e',
- + "\x1f" => '\u001f',
- + // Prevent browsers from interpreting these as as special.
- + "'" => '\u0027',
- + '<' => '\u003c',
- + '>' => '\u003e',
- + '&' => '\u0026',
- + // Prevent browsers from interpreting the solidus as special and
- + // non-compliant JSON parsers from interpreting // as a comment.
- + '/' => '\u002f',
- + // While these are allowed unescaped according to ECMA-262, section
- + // 15.12.2, this causes problems in the core jQuery JSON parser.
- + "\xe2\x80\xa8" => '\u2028', // U+2028, Line Separator.
- + "\xe2\x80\xa9" => '\u2029', // U+2029, Paragraph Separator.
- + );
- + }
- + return '"'. strtr($var, $replace_pairs) .'"';
- case 'array':
- // Arrays in JSON can't be associative. If the array is empty or if it
- // has sequential whole number keys starting with 0, it's not associative
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement