Changeset 19094

Timestamp:

10/31/2011 07:38:46 PM (13 years ago)

Author:

ryan

Message:

Avoid E_STRICT notices. see #18975

Location:

trunk/wp-includes

Files:

• class-http.php (modified) (12 diffs)
• class-wp.php (modified) (1 diff)
• general-template.php (modified) (1 diff)
• ms-load.php (modified) (1 diff)
• post.php (modified) (1 diff)

trunk/wp-includes/class-http.php

@@ -347 +347 @@
      *                  Then a numbered array is returned as the value of that header-key.
      */
-    function processHeaders($headers) {
+    public static function processHeaders($headers) {
         // split headers, one per array element
         if ( is_string($headers) ) {
@@ -414 +414 @@
      * @param array $r Full array of args passed into ::request()
      */
-    function buildCookieHeader( &$r ) {
+    public static function buildCookieHeader( &$r ) {
         if ( ! empty($r['cookies']) ) {
             $cookies_header = '';
@@ -757 +757 @@
      * @return boolean False means this class can not be used, true means it can.
      */
-    function test( $args = array() ) {
+    public static function test( $args = array() ) {
         if ( ! function_exists( 'fsockopen' ) )
             return false;
@@ -940 +940 @@
      * @return boolean False means this class can not be used, true means it can.
      */
-    function test( $args = array() ) {
+    public static function test( $args = array() ) {
         if ( ! function_exists( 'fopen' ) )
             return false;
@@ -1167 +1167 @@
      * @return boolean False means this class can not be used, true means it can.
      */
-    function test( $args = array() ) {
+    public static function test( $args = array() ) {
         if ( ! function_exists( 'curl_init' ) || ! function_exists( 'curl_exec' ) )
             return false;
@@ -1581 +1581 @@
      * @return string|bool False on failure.
      */
-    function compress( $raw, $level = 9, $supports = null ) {
+    public static function compress( $raw, $level = 9, $supports = null ) {
         return gzdeflate( $raw, $level );
     }
@@ -1599 +1599 @@
      * @return string|bool False on failure.
      */
-    function decompress( $compressed, $length = null ) {
+    public static function decompress( $compressed, $length = null ) {
 
         if ( empty($compressed) )
@@ -1643 +1643 @@
      * @return string|bool False on failure.
      */
-    function compatible_gzinflate($gzData) {
+    public static function compatible_gzinflate($gzData) {
 
         // Compressed data might contain a full header, if so strip it for gzinflate()
@@ -1681 +1681 @@
      * @return string Types of encoding to accept.
      */
-    function accept_encoding() {
+    public static function accept_encoding() {
         $type = array();
         if ( function_exists( 'gzinflate' ) )
@@ -1702 +1702 @@
      * @return string Content-Encoding string to send in the header.
      */
-    function content_encoding() {
+    public static function content_encoding() {
         return 'deflate';
     }
@@ -1714 +1714 @@
      * @return bool
      */
-    function should_decode($headers) {
+    public static function should_decode($headers) {
         if ( is_array( $headers ) ) {
             if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
@@ -1736 +1736 @@
      * @return bool
      */
-    function is_available() {
+    public static function is_available() {
         return ( function_exists('gzuncompress') || function_exists('gzdeflate') || function_exists('gzinflate') );
     }

trunk/wp-includes/class-wp.php

@@ -573 +573 @@
      * @return string
      */
-    function apply($subject, $matches) {
+    public static function apply($subject, $matches) {
         $oSelf = new WP_MatchesMapRegex($subject, $matches);
         return $oSelf->output;

trunk/wp-includes/general-template.php

@@ -1622 +1622 @@
 
     if ( is_single() || is_page() ) {
-        $post = &get_post( $id = 0 );
+        $id = 0;
+        $post = &get_post( $id );
 
         if ( comments_open() || pings_open() || $post->comment_count > 0 ) {

trunk/wp-includes/ms-load.php

@@ -135 +135 @@
 function wpmu_current_site() {
     global $wpdb, $current_site, $domain, $path, $sites, $cookie_domain;
+
+    if ( empty( $current_site ) )
+        $current_site = new stdClass;
+
     if ( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
         $current_site->id = defined( 'SITE_ID_CURRENT_SITE' ) ? SITE_ID_CURRENT_SITE : 1;

trunk/wp-includes/post.php

@@ -4028 +4028 @@
             $icon_files = array();
             while ( $dirs ) {
-                $dir = array_shift($keys = array_keys($dirs));
+                $keys = array_keys( $dirs );
+                $dir = array_shift( $keys );
                 $uri = array_shift($dirs);
                 if ( $dh = opendir($dir) ) {