WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use square brackets instead of braces for string access. props hakre, fixes #13900. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@16340 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-11-13 09:53:55 +00:00
parent f6d1e9c634
commit 81a8f2d3ce
11 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/import.php
View File

@ -62,7 +62,7 @@ $import_root = ABSPATH.$import_loc;
$imports_dir = @ opendir($import_root); $imports_dir = @ opendir($import_root);
if ($imports_dir) { if ($imports_dir) {
while (($file = readdir($imports_dir)) !== false) { while (($file = readdir($imports_dir)) !== false) {
if ($file{0} == '.') { if ($file[0] == '.') {
continue; continue;
} elseif (substr($file, -4) == '.php') { } elseif (substr($file, -4) == '.php') {
require_once($import_root . '/' . $file); require_once($import_root . '/' . $file);

2
wp-admin/includes/media.php
View File

@ -1258,7 +1258,7 @@ function get_media_item( $attachment_id, $args = null ) {
$hidden_fields = array(); $hidden_fields = array();
foreach ( $form_fields as $id => $field ) { foreach ( $form_fields as $id => $field ) {
if ( $id{0} == '_' ) if ( $id[0] == '_' )
continue; continue;
if ( !empty( $field['tr'] ) ) { if ( !empty( $field['tr'] ) ) {

2
wp-admin/includes/misc.php
View File

@ -576,7 +576,7 @@ function win_is_writable($path) {
* see http://bugs.php.net/bug.php?id=30931 * see http://bugs.php.net/bug.php?id=30931
*/ */
if ( $path{strlen($path)-1} == '/' ) // recursively return a temporary file path if ( $path[strlen($path)-1] == '/' ) // recursively return a temporary file path
return win_is_writable($path . uniqid(mt_rand()) . '.tmp'); return win_is_writable($path . uniqid(mt_rand()) . '.tmp');
else if ( is_dir($path) ) else if ( is_dir($path) )
return win_is_writable($path . '/' . uniqid(mt_rand()) . '.tmp'); return win_is_writable($path . '/' . uniqid(mt_rand()) . '.tmp');

76
wp-includes/class-json.php
View File

@ -153,7 +153,7 @@ class Services_JSON
return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16'); return mb_convert_encoding($utf16, 'UTF-8', 'UTF-16');
} }
$bytes = (ord($utf16{0}) << 8) | ord($utf16{1}); $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
switch(true) { switch(true) {
case ((0x7F & $bytes) == $bytes): case ((0x7F & $bytes) == $bytes):
@ -206,17 +206,17 @@ class Services_JSON
case 2: case 2:
// return a UTF-16 character from a 2-byte UTF-8 char // return a UTF-16 character from a 2-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr(0x07 & (ord($utf8{0}) >> 2)) return chr(0x07 & (ord($utf8[0]) >> 2))
. chr((0xC0 & (ord($utf8{0}) << 6)) . chr((0xC0 & (ord($utf8[0]) << 6))
| (0x3F & ord($utf8{1}))); | (0x3F & ord($utf8[1])));
case 3: case 3:
// return a UTF-16 character from a 3-byte UTF-8 char // return a UTF-16 character from a 3-byte UTF-8 char
// see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
return chr((0xF0 & (ord($utf8{0}) << 4)) return chr((0xF0 & (ord($utf8[0]) << 4))
| (0x0F & (ord($utf8{1}) >> 2))) | (0x0F & (ord($utf8[1]) >> 2)))
. chr((0xC0 & (ord($utf8{1}) << 6)) . chr((0xC0 & (ord($utf8[1]) << 6))
| (0x7F & ord($utf8{2}))); | (0x7F & ord($utf8[2])));
} }
// ignoring UTF-32 for now, sorry // ignoring UTF-32 for now, sorry
@ -293,7 +293,7 @@ class Services_JSON
*/ */
for ($c = 0; $c < $strlen_var; ++$c) { for ($c = 0; $c < $strlen_var; ++$c) {
$ord_var_c = ord($var{$c}); $ord_var_c = ord($var[$c]);
switch (true) { switch (true) {
case $ord_var_c == 0x08: case $ord_var_c == 0x08:
@ -316,12 +316,12 @@ class Services_JSON
case $ord_var_c == 0x2F: case $ord_var_c == 0x2F:
case $ord_var_c == 0x5C: case $ord_var_c == 0x5C:
// double quote, slash, slosh // double quote, slash, slosh
$ascii .= '\\'.$var{$c}; $ascii .= '\\'.$var[$c];
break; break;
case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)): case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)):
// characters U-00000000 - U-0000007F (same as ASCII) // characters U-00000000 - U-0000007F (same as ASCII)
$ascii .= $var{$c}; $ascii .= $var[$c];
break; break;
case (($ord_var_c & 0xE0) == 0xC0): case (($ord_var_c & 0xE0) == 0xC0):
@ -333,7 +333,7 @@ class Services_JSON
break; break;
} }
$char = pack('C*', $ord_var_c, ord($var{$c + 1})); $char = pack('C*', $ord_var_c, ord($var[$c + 1]));
$c += 1; $c += 1;
$utf16 = $this->utf82utf16($char); $utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16)); $ascii .= sprintf('\u%04s', bin2hex($utf16));
@ -348,8 +348,8 @@ class Services_JSON
// characters U-00000800 - U-0000FFFF, mask 1110XXXX // characters U-00000800 - U-0000FFFF, mask 1110XXXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$char = pack('C*', $ord_var_c, $char = pack('C*', $ord_var_c,
@ord($var{$c + 1}), @ord($var[$c + 1]),
@ord($var{$c + 2})); @ord($var[$c + 2]));
$c += 2; $c += 2;
$utf16 = $this->utf82utf16($char); $utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16)); $ascii .= sprintf('\u%04s', bin2hex($utf16));
@ -364,9 +364,9 @@ class Services_JSON
// characters U-00010000 - U-001FFFFF, mask 11110XXX // characters U-00010000 - U-001FFFFF, mask 11110XXX
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$char = pack('C*', $ord_var_c, $char = pack('C*', $ord_var_c,
ord($var{$c + 1}), ord($var[$c + 1]),
ord($var{$c + 2}), ord($var[$c + 2]),
ord($var{$c + 3})); ord($var[$c + 3]));
$c += 3; $c += 3;
$utf16 = $this->utf82utf16($char); $utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16)); $ascii .= sprintf('\u%04s', bin2hex($utf16));
@ -381,10 +381,10 @@ class Services_JSON
break; break;
} }
$char = pack('C*', $ord_var_c, $char = pack('C*', $ord_var_c,
ord($var{$c + 1}), ord($var[$c + 1]),
ord($var{$c + 2}), ord($var[$c + 2]),
ord($var{$c + 3}), ord($var[$c + 3]),
ord($var{$c + 4})); ord($var[$c + 4]));
$c += 4; $c += 4;
$utf16 = $this->utf82utf16($char); $utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16)); $ascii .= sprintf('\u%04s', bin2hex($utf16));
@ -399,11 +399,11 @@ class Services_JSON
// characters U-04000000 - U-7FFFFFFF, mask 1111110X // characters U-04000000 - U-7FFFFFFF, mask 1111110X
// see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
$char = pack('C*', $ord_var_c, $char = pack('C*', $ord_var_c,
ord($var{$c + 1}), ord($var[$c + 1]),
ord($var{$c + 2}), ord($var[$c + 2]),
ord($var{$c + 3}), ord($var[$c + 3]),
ord($var{$c + 4}), ord($var[$c + 4]),
ord($var{$c + 5})); ord($var[$c + 5]));
$c += 5; $c += 5;
$utf16 = $this->utf82utf16($char); $utf16 = $this->utf82utf16($char);
$ascii .= sprintf('\u%04s', bin2hex($utf16)); $ascii .= sprintf('\u%04s', bin2hex($utf16));
@ -577,7 +577,7 @@ class Services_JSON
for ($c = 0; $c < $strlen_chrs; ++$c) { for ($c = 0; $c < $strlen_chrs; ++$c) {
$substr_chrs_c_2 = substr($chrs, $c, 2); $substr_chrs_c_2 = substr($chrs, $c, 2);
$ord_chrs_c = ord($chrs{$c}); $ord_chrs_c = ord($chrs[$c]);
switch (true) { switch (true) {
case $substr_chrs_c_2 == '\b': case $substr_chrs_c_2 == '\b':
@ -607,7 +607,7 @@ class Services_JSON
case $substr_chrs_c_2 == '\\/': case $substr_chrs_c_2 == '\\/':
if (($delim == '"' && $substr_chrs_c_2 != '\\\'') || if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
($delim == "'" && $substr_chrs_c_2 != '\\"')) { ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
$utf8 .= $chrs{++$c}; $utf8 .= $chrs[++$c];
} }
break; break;
@ -620,7 +620,7 @@ class Services_JSON
break; break;
case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F): case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
$utf8 .= $chrs{$c}; $utf8 .= $chrs[$c];
break; break;
case ($ord_chrs_c & 0xE0) == 0xC0: case ($ord_chrs_c & 0xE0) == 0xC0:
@ -667,7 +667,7 @@ class Services_JSON
} elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) { } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) {
// array, or object notation // array, or object notation
if ($str{0} == '[') { if ($str[0] == '[') {
$stk = array(SERVICES_JSON_IN_ARR); $stk = array(SERVICES_JSON_IN_ARR);
$arr = array(); $arr = array();
} else { } else {
@ -706,7 +706,7 @@ class Services_JSON
$top = end($stk); $top = end($stk);
$substr_chrs_c_2 = substr($chrs, $c, 2); $substr_chrs_c_2 = substr($chrs, $c, 2);
if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == SERVICES_JSON_SLICE))) { if (($c == $strlen_chrs) || (($chrs[$c] == ',') && ($top['what'] == SERVICES_JSON_SLICE))) {
// found a comma that is not inside a string, array, etc., // found a comma that is not inside a string, array, etc.,
// OR we've reached the end of the character list // OR we've reached the end of the character list
$slice = substr($chrs, $top['where'], ($c - $top['where'])); $slice = substr($chrs, $top['where'], ($c - $top['where']));
@ -748,12 +748,12 @@ class Services_JSON
} }
} elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) { } elseif ((($chrs[$c] == '"') || ($chrs[$c] == "'")) && ($top['what'] != SERVICES_JSON_IN_STR)) {
// found a quote, and we are not inside a string // found a quote, and we are not inside a string
array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c})); array_push($stk, array('what' => SERVICES_JSON_IN_STR, 'where' => $c, 'delim' => $chrs[$c]));
//print("Found start of string at {$c}\n"); //print("Found start of string at {$c}\n");
} elseif (($chrs{$c} == $top['delim']) && } elseif (($chrs[$c] == $top['delim']) &&
($top['what'] == SERVICES_JSON_IN_STR) && ($top['what'] == SERVICES_JSON_IN_STR) &&
((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) { ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) {
// found a quote, we're in a string, and it's not escaped // found a quote, we're in a string, and it's not escaped
@ -762,24 +762,24 @@ class Services_JSON
array_pop($stk); array_pop($stk);
//print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n"); //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n");
} elseif (($chrs{$c} == '[') && } elseif (($chrs[$c] == '[') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) { in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a left-bracket, and we are in an array, object, or slice // found a left-bracket, and we are in an array, object, or slice
array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false)); array_push($stk, array('what' => SERVICES_JSON_IN_ARR, 'where' => $c, 'delim' => false));
//print("Found start of array at {$c}\n"); //print("Found start of array at {$c}\n");
} elseif (($chrs{$c} == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) { } elseif (($chrs[$c] == ']') && ($top['what'] == SERVICES_JSON_IN_ARR)) {
// found a right-bracket, and we're in an array // found a right-bracket, and we're in an array
array_pop($stk); array_pop($stk);
//print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");
} elseif (($chrs{$c} == '{') && } elseif (($chrs[$c] == '{') &&
in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) { in_array($top['what'], array(SERVICES_JSON_SLICE, SERVICES_JSON_IN_ARR, SERVICES_JSON_IN_OBJ))) {
// found a left-brace, and we are in an array, object, or slice // found a left-brace, and we are in an array, object, or slice
array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false)); array_push($stk, array('what' => SERVICES_JSON_IN_OBJ, 'where' => $c, 'delim' => false));
//print("Found start of object at {$c}\n"); //print("Found start of object at {$c}\n");
} elseif (($chrs{$c} == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) { } elseif (($chrs[$c] == '}') && ($top['what'] == SERVICES_JSON_IN_OBJ)) {
// found a right-brace, and we're in an object // found a right-brace, and we're in an object
array_pop($stk); array_pop($stk);
//print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n");

2
wp-includes/class-pop3.php
View File

@ -367,7 +367,7 @@ class POP3 {
$line = fgets($fp,$buffer); $line = fgets($fp,$buffer);
while ( !ereg("^\.\r\n",$line)) while ( !ereg("^\.\r\n",$line))
{ {
if ( $line{0} == '.' ) { $line = substr($line,1); } if ( $line[0] == '.' ) { $line = substr($line,1); }
$MsgArray[$count] = $line; $MsgArray[$count] = $line;
$count++; $count++;
$line = fgets($fp,$buffer); $line = fgets($fp,$buffer);

10
wp-includes/formatting.php
View File

@ -92,7 +92,7 @@ function wptexturize($text) {
for ( $i = 0; $i < $stop; $i++ ) { for ( $i = 0; $i < $stop; $i++ ) {
$curl = $textarr[$i]; $curl = $textarr[$i];
if ( !empty($curl) && '<' != $curl{0} && '[' != $curl{0} if ( !empty($curl) && '<' != $curl[0] && '[' != $curl[0]
&& empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) { && empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) {
// This is not a tag, nor is the texturization disabled // This is not a tag, nor is the texturization disabled
// static strings // static strings
@ -113,9 +113,9 @@ function wptexturize($text) {
* Only call _wptexturize_pushpop_element if first char is correct * Only call _wptexturize_pushpop_element if first char is correct
* tag opening * tag opening
*/ */
if ('<' == $curl{0}) if ('<' == $curl[0])
_wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags, '<', '>'); _wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags, '<', '>');
elseif ('[' == $curl{0}) elseif ('[' == $curl[0])
_wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']'); _wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes, '[', ']');
} }
@ -1498,7 +1498,7 @@ function convert_smilies($text) {
$stop = count($textarr);// loop stuff $stop = count($textarr);// loop stuff
for ($i = 0; $i < $stop; $i++) { for ($i = 0; $i < $stop; $i++) {
$content = $textarr[$i]; $content = $textarr[$i];
if ((strlen($content) > 0) && ('<' != $content{0})) { // If it's not a tag if ((strlen($content) > 0) && ('<' != $content[0])) { // If it's not a tag
$content = preg_replace_callback($wp_smiliessearch, 'translate_smiley', $content); $content = preg_replace_callback($wp_smiliessearch, 'translate_smiley', $content);
} }
$output .= $content; $output .= $content;
@ -2632,7 +2632,7 @@ function wp_sprintf( $pattern ) {
$fragment = substr($pattern, $start, $end - $start); $fragment = substr($pattern, $start, $end - $start);
// Fragment has a specifier // Fragment has a specifier
if ( $pattern{$start} == '%' ) { if ( $pattern[$start] == '%' ) {
// Find numbered arguments or take the next one in order // Find numbered arguments or take the next one in order
if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) { if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) {
$arg = isset($args[$matches[1]]) ? $args[$matches[1]] : ''; $arg = isset($args[$matches[1]]) ? $args[$matches[1]] : '';

2
wp-includes/functions.php
View File

@ -2081,7 +2081,7 @@ function path_is_absolute( $path ) {
if ( realpath($path) == $path ) if ( realpath($path) == $path )
return true; return true;
if ( strlen($path) == 0 || $path{0} == '.' ) if ( strlen($path) == 0 || $path[0] == '.' )
return false; return false;
// windows allows absolute paths like this // windows allows absolute paths like this

2
wp-includes/pluggable.php
View File

@ -1658,7 +1658,7 @@ function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) {
$host = 'https://secure.gravatar.com'; $host = 'https://secure.gravatar.com';
} else { } else {
if ( !empty($email) ) if ( !empty($email) )
$host = sprintf( "http://%d.gravatar.com", ( hexdec( $email_hash{0} ) % 2 ) ); $host = sprintf( "http://%d.gravatar.com", ( hexdec( $email_hash[0] ) % 2 ) );
else else
$host = 'http://0.gravatar.com'; $host = 'http://0.gravatar.com';
} }

2
wp-includes/post-template.php
View File

@ -727,7 +727,7 @@ function the_meta() {
echo "<ul class='post-meta'>\n"; echo "<ul class='post-meta'>\n";
foreach ( (array) $keys as $key ) { foreach ( (array) $keys as $key ) {
$keyt = trim($key); $keyt = trim($key);
if ( '_' == $keyt{0} ) if ( '_' == $keyt[0] )
continue; continue;
$values = array_map('trim', get_post_custom_values($key)); $values = array_map('trim', get_post_custom_values($key));
$value = implode($values,', '); $value = implode($values,', ');

2
wp-includes/rewrite.php
View File

@ -34,7 +34,7 @@ function add_rewrite_rule($regex, $redirect, $after = 'bottom') {
*/ */
function add_rewrite_tag($tagname, $regex) { function add_rewrite_tag($tagname, $regex) {
//validation //validation
if ( strlen($tagname) < 3 || $tagname{0} != '%' || $tagname{strlen($tagname)-1} != '%' ) if ( strlen($tagname) < 3 || $tagname[0] != '%' || $tagname[strlen($tagname)-1] != '%' )
return; return;
$qv = trim($tagname, '%'); $qv = trim($tagname, '%');

4
wp-includes/theme.php
View File

@ -597,7 +597,7 @@ function search_theme_directories() {
while ( ($theme_dir = readdir($themes_dir)) !== false ) { while ( ($theme_dir = readdir($themes_dir)) !== false ) {
if ( is_dir($theme_root . '/' . $theme_dir) && is_readable($theme_root . '/' . $theme_dir) ) { if ( is_dir($theme_root . '/' . $theme_dir) && is_readable($theme_root . '/' . $theme_dir) ) {
if ( $theme_dir{0} == '.' || $theme_dir == 'CVS' ) if ( $theme_dir[0] == '.' || $theme_dir == 'CVS' )
continue; continue;
$stylish_dir = @opendir($theme_root . '/' . $theme_dir); $stylish_dir = @opendir($theme_root . '/' . $theme_dir);
@ -620,7 +620,7 @@ function search_theme_directories() {
$found_subdir_themes = false; $found_subdir_themes = false;
while ( ($theme_subdir = readdir($theme_subdirs)) !== false ) { while ( ($theme_subdir = readdir($theme_subdirs)) !== false ) {
if ( is_dir( $subdir . '/' . $theme_subdir) && is_readable($subdir . '/' . $theme_subdir) ) { if ( is_dir( $subdir . '/' . $theme_subdir) && is_readable($subdir . '/' . $theme_subdir) ) {
if ( $theme_subdir{0} == '.' || $theme_subdir == 'CVS' ) if ( $theme_subdir[0] == '.' || $theme_subdir == 'CVS' )
continue; continue;
$stylish_dir = @opendir($subdir . '/' . $theme_subdir); $stylish_dir = @opendir($subdir . '/' . $theme_subdir);