From 81a8f2d3cec53365b2c40e68d89ffc92eca34670 Mon Sep 17 00:00:00 2001 From: nacin Date: Sat, 13 Nov 2010 09:53:55 +0000 Subject: [PATCH] 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 --- wp-admin/import.php | 2 +- wp-admin/includes/media.php | 2 +- wp-admin/includes/misc.php | 2 +- wp-includes/class-json.php | 76 +++++++++++++++++------------------ wp-includes/class-pop3.php | 2 +- wp-includes/formatting.php | 10 ++--- wp-includes/functions.php | 2 +- wp-includes/pluggable.php | 2 +- wp-includes/post-template.php | 2 +- wp-includes/rewrite.php | 2 +- wp-includes/theme.php | 4 +- 11 files changed, 53 insertions(+), 53 deletions(-) diff --git a/wp-admin/import.php b/wp-admin/import.php index e5e29b0a6..0e1e325af 100644 --- a/wp-admin/import.php +++ b/wp-admin/import.php @@ -62,7 +62,7 @@ $import_root = ABSPATH.$import_loc; $imports_dir = @ opendir($import_root); if ($imports_dir) { while (($file = readdir($imports_dir)) !== false) { - if ($file{0} == '.') { + if ($file[0] == '.') { continue; } elseif (substr($file, -4) == '.php') { require_once($import_root . '/' . $file); diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php index 2ed0ef645..23abff848 100644 --- a/wp-admin/includes/media.php +++ b/wp-admin/includes/media.php @@ -1258,7 +1258,7 @@ function get_media_item( $attachment_id, $args = null ) { $hidden_fields = array(); foreach ( $form_fields as $id => $field ) { - if ( $id{0} == '_' ) + if ( $id[0] == '_' ) continue; if ( !empty( $field['tr'] ) ) { diff --git a/wp-admin/includes/misc.php b/wp-admin/includes/misc.php index 61941e012..980e17a18 100644 --- a/wp-admin/includes/misc.php +++ b/wp-admin/includes/misc.php @@ -576,7 +576,7 @@ function win_is_writable($path) { * 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'); else if ( is_dir($path) ) return win_is_writable($path . '/' . uniqid(mt_rand()) . '.tmp'); diff --git a/wp-includes/class-json.php b/wp-includes/class-json.php index 7582609a6..75010df20 100644 --- a/wp-includes/class-json.php +++ b/wp-includes/class-json.php @@ -153,7 +153,7 @@ class Services_JSON 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) { case ((0x7F & $bytes) == $bytes): @@ -206,17 +206,17 @@ class Services_JSON case 2: // return a UTF-16 character from a 2-byte UTF-8 char // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr(0x07 & (ord($utf8{0}) >> 2)) - . chr((0xC0 & (ord($utf8{0}) << 6)) - | (0x3F & ord($utf8{1}))); + return chr(0x07 & (ord($utf8[0]) >> 2)) + . chr((0xC0 & (ord($utf8[0]) << 6)) + | (0x3F & ord($utf8[1]))); case 3: // return a UTF-16 character from a 3-byte UTF-8 char // see: http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 - return chr((0xF0 & (ord($utf8{0}) << 4)) - | (0x0F & (ord($utf8{1}) >> 2))) - . chr((0xC0 & (ord($utf8{1}) << 6)) - | (0x7F & ord($utf8{2}))); + return chr((0xF0 & (ord($utf8[0]) << 4)) + | (0x0F & (ord($utf8[1]) >> 2))) + . chr((0xC0 & (ord($utf8[1]) << 6)) + | (0x7F & ord($utf8[2]))); } // ignoring UTF-32 for now, sorry @@ -293,7 +293,7 @@ class Services_JSON */ for ($c = 0; $c < $strlen_var; ++$c) { - $ord_var_c = ord($var{$c}); + $ord_var_c = ord($var[$c]); switch (true) { case $ord_var_c == 0x08: @@ -316,12 +316,12 @@ class Services_JSON case $ord_var_c == 0x2F: case $ord_var_c == 0x5C: // double quote, slash, slosh - $ascii .= '\\'.$var{$c}; + $ascii .= '\\'.$var[$c]; break; case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)): // characters U-00000000 - U-0000007F (same as ASCII) - $ascii .= $var{$c}; + $ascii .= $var[$c]; break; case (($ord_var_c & 0xE0) == 0xC0): @@ -333,7 +333,7 @@ class Services_JSON break; } - $char = pack('C*', $ord_var_c, ord($var{$c + 1})); + $char = pack('C*', $ord_var_c, ord($var[$c + 1])); $c += 1; $utf16 = $this->utf82utf16($char); $ascii .= sprintf('\u%04s', bin2hex($utf16)); @@ -348,8 +348,8 @@ class Services_JSON // characters U-00000800 - U-0000FFFF, mask 1110XXXX // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 $char = pack('C*', $ord_var_c, - @ord($var{$c + 1}), - @ord($var{$c + 2})); + @ord($var[$c + 1]), + @ord($var[$c + 2])); $c += 2; $utf16 = $this->utf82utf16($char); $ascii .= sprintf('\u%04s', bin2hex($utf16)); @@ -364,9 +364,9 @@ class Services_JSON // characters U-00010000 - U-001FFFFF, mask 11110XXX // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3})); + ord($var[$c + 1]), + ord($var[$c + 2]), + ord($var[$c + 3])); $c += 3; $utf16 = $this->utf82utf16($char); $ascii .= sprintf('\u%04s', bin2hex($utf16)); @@ -381,10 +381,10 @@ class Services_JSON break; } $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3}), - ord($var{$c + 4})); + ord($var[$c + 1]), + ord($var[$c + 2]), + ord($var[$c + 3]), + ord($var[$c + 4])); $c += 4; $utf16 = $this->utf82utf16($char); $ascii .= sprintf('\u%04s', bin2hex($utf16)); @@ -399,11 +399,11 @@ class Services_JSON // characters U-04000000 - U-7FFFFFFF, mask 1111110X // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 $char = pack('C*', $ord_var_c, - ord($var{$c + 1}), - ord($var{$c + 2}), - ord($var{$c + 3}), - ord($var{$c + 4}), - ord($var{$c + 5})); + ord($var[$c + 1]), + ord($var[$c + 2]), + ord($var[$c + 3]), + ord($var[$c + 4]), + ord($var[$c + 5])); $c += 5; $utf16 = $this->utf82utf16($char); $ascii .= sprintf('\u%04s', bin2hex($utf16)); @@ -577,7 +577,7 @@ class Services_JSON for ($c = 0; $c < $strlen_chrs; ++$c) { $substr_chrs_c_2 = substr($chrs, $c, 2); - $ord_chrs_c = ord($chrs{$c}); + $ord_chrs_c = ord($chrs[$c]); switch (true) { case $substr_chrs_c_2 == '\b': @@ -607,7 +607,7 @@ class Services_JSON case $substr_chrs_c_2 == '\\/': if (($delim == '"' && $substr_chrs_c_2 != '\\\'') || ($delim == "'" && $substr_chrs_c_2 != '\\"')) { - $utf8 .= $chrs{++$c}; + $utf8 .= $chrs[++$c]; } break; @@ -620,7 +620,7 @@ class Services_JSON break; case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F): - $utf8 .= $chrs{$c}; + $utf8 .= $chrs[$c]; break; case ($ord_chrs_c & 0xE0) == 0xC0: @@ -667,7 +667,7 @@ class Services_JSON } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) { // array, or object notation - if ($str{0} == '[') { + if ($str[0] == '[') { $stk = array(SERVICES_JSON_IN_ARR); $arr = array(); } else { @@ -706,7 +706,7 @@ class Services_JSON $top = end($stk); $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., // OR we've reached the end of the character list $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 - 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"); - } elseif (($chrs{$c} == $top['delim']) && + } elseif (($chrs[$c] == $top['delim']) && ($top['what'] == SERVICES_JSON_IN_STR) && ((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 @@ -762,24 +762,24 @@ class Services_JSON array_pop($stk); //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))) { // 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)); //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 array_pop($stk); //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))) { // 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)); //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 array_pop($stk); //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); diff --git a/wp-includes/class-pop3.php b/wp-includes/class-pop3.php index 610f678d8..998e9a1e3 100644 --- a/wp-includes/class-pop3.php +++ b/wp-includes/class-pop3.php @@ -367,7 +367,7 @@ class POP3 { $line = fgets($fp,$buffer); while ( !ereg("^\.\r\n",$line)) { - if ( $line{0} == '.' ) { $line = substr($line,1); } + if ( $line[0] == '.' ) { $line = substr($line,1); } $MsgArray[$count] = $line; $count++; $line = fgets($fp,$buffer); diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 880f2c4d5..cb5b9304e 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -92,7 +92,7 @@ function wptexturize($text) { for ( $i = 0; $i < $stop; $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)) { // This is not a tag, nor is the texturization disabled // static strings @@ -113,9 +113,9 @@ function wptexturize($text) { * Only call _wptexturize_pushpop_element if first char is correct * tag opening */ - if ('<' == $curl{0}) + if ('<' == $curl[0]) _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, '[', ']'); } @@ -1498,7 +1498,7 @@ function convert_smilies($text) { $stop = count($textarr);// loop stuff for ($i = 0; $i < $stop; $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); } $output .= $content; @@ -2632,7 +2632,7 @@ function wp_sprintf( $pattern ) { $fragment = substr($pattern, $start, $end - $start); // Fragment has a specifier - if ( $pattern{$start} == '%' ) { + if ( $pattern[$start] == '%' ) { // Find numbered arguments or take the next one in order if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) { $arg = isset($args[$matches[1]]) ? $args[$matches[1]] : ''; diff --git a/wp-includes/functions.php b/wp-includes/functions.php index e27386c8b..dd3436b11 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -2081,7 +2081,7 @@ function path_is_absolute( $path ) { if ( realpath($path) == $path ) return true; - if ( strlen($path) == 0 || $path{0} == '.' ) + if ( strlen($path) == 0 || $path[0] == '.' ) return false; // windows allows absolute paths like this diff --git a/wp-includes/pluggable.php b/wp-includes/pluggable.php index f584bc479..82efbe570 100644 --- a/wp-includes/pluggable.php +++ b/wp-includes/pluggable.php @@ -1658,7 +1658,7 @@ function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) { $host = 'https://secure.gravatar.com'; } else { 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 $host = 'http://0.gravatar.com'; } diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index 0b1db1a1b..ae5708e7b 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -727,7 +727,7 @@ function the_meta() { echo "