Changeset 16340

Timestamp:

11/13/2010 09:53:55 AM (13 years ago)

Author:

nacin

Message:

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

Location:

trunk

Files:

• wp-admin/import.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-includes/class-json.php (modified) (18 diffs)
• wp-includes/class-pop3.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (4 diffs)
• wp-includes/functions.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/rewrite.php (modified) (1 diff)
• wp-includes/theme.php (modified) (2 diffs)

trunk/wp-admin/import.php

@@ -63 +63 @@
 if ($imports_dir) {
     while (($file = readdir($imports_dir)) !== false) {
-        if ($file{0} == '.') {
+        if ($file[0] == '.') {
             continue;
         } elseif (substr($file, -4) == '.php') {

trunk/wp-admin/includes/media.php

@@ -1259 +1259 @@
 
     foreach ( $form_fields as $id => $field ) {
-        if ( $id{0} == '_' )
+        if ( $id[0] == '_' )
             continue;
 

trunk/wp-admin/includes/misc.php

@@ -577 +577 @@
      */
 
-    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) )

trunk/wp-includes/class-json.php

@@ -154 +154 @@
         }
 
-        $bytes = (ord($utf16{0}) << 8) | ord($utf16{1});
+        $bytes = (ord($utf16[0]) << 8) | ord($utf16[1]);
 
         switch(true) {
@@ -207 +207 @@
                 // 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])));
         }
 
@@ -294 +294 @@
                 for ($c = 0; $c < $strlen_var; ++$c) {
 
-                    $ord_var_c = ord($var{$c});
+                    $ord_var_c = ord($var[$c]);
 
                     switch (true) {
@@ -317 +317 @@
                         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;
 
@@ -334 +334 @@
                             }
 
-                            $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);
@@ -349 +349 @@
                             // 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);
@@ -365 +365 @@
                             // 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);
@@ -382 +382 @@
                             }
                             $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);
@@ -400 +400 @@
                             // 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);
@@ -578 +578 @@
 
                         $substr_chrs_c_2 = substr($chrs, $c, 2);
-                        $ord_chrs_c = ord($chrs{$c});
+                        $ord_chrs_c = ord($chrs[$c]);
 
                         switch (true) {
@@ -608 +608 @@
                                 if (($delim == '"' && $substr_chrs_c_2 != '\\\'') ||
                                 ($delim == "'" && $substr_chrs_c_2 != '\\"')) {
-                                    $utf8 .= $chrs{++$c};
+                                    $utf8 .= $chrs[++$c];
                                 }
                                 break;
@@ -621 +621 @@
 
                             case ($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F):
-                                $utf8 .= $chrs{$c};
+                                $utf8 .= $chrs[$c];
                                 break;
 
@@ -668 +668 @@
                     // array, or object notation
 
-                    if ($str{0} == '[') {
+                    if ($str[0] == '[') {
                         $stk = array(SERVICES_JSON_IN_ARR);
                         $arr = array();
@@ -707 +707 @@
                         $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
@@ -749 +749 @@
                             }
 
-                        } 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)) {
@@ -763 +763 @@
                             //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
@@ -769 +769 @@
                             //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
@@ -780 +780 @@
                             //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);

trunk/wp-includes/class-pop3.php

@@ -368 +368 @@
         while ( !ereg("^\.\r\n",$line))
         {
-            if ( $line{0} == '.' ) { $line = substr($line,1); }
+            if ( $line[0] == '.' ) { $line = substr($line,1); }
             $MsgArray[$count] = $line;
             $count++;

trunk/wp-includes/formatting.php

@@ -93 +93 @@
         $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
@@ -114 +114 @@
              * 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, '[', ']');
         }
@@ -1499 +1499 @@
         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);
             }
@@ -2633 +2633 @@
 
         // 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) ) {

trunk/wp-includes/functions.php

@@ -2082 +2082 @@
         return true;
 
-    if ( strlen($path) == 0 || $path{0} == '.' )
+    if ( strlen($path) == 0 || $path[0] == '.' )
         return false;
 

trunk/wp-includes/pluggable.php

@@ -1659 +1659 @@
     } 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';

trunk/wp-includes/post-template.php

@@ -728 +728 @@
         foreach ( (array) $keys as $key ) {
             $keyt = trim($key);
-            if ( '_' == $keyt{0} )
+            if ( '_' == $keyt[0] )
                 continue;
             $values = array_map('trim', get_post_custom_values($key));

trunk/wp-includes/rewrite.php

@@ -35 +35 @@
 function add_rewrite_tag($tagname, $regex) {
     //validation
-    if ( strlen($tagname) < 3 || $tagname{0} != '%' || $tagname{strlen($tagname)-1} != '%' )
+    if ( strlen($tagname) < 3 || $tagname[0] != '%' || $tagname[strlen($tagname)-1] != '%' )
         return;
 

trunk/wp-includes/theme.php

@@ -598 +598 @@
         while ( ($theme_dir = readdir($themes_dir)) !== false ) {
             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;
 
@@ -621 +621 @@
                     while ( ($theme_subdir = readdir($theme_subdirs)) !== false ) {
                         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;