Fix component filter warnings.

Ville Siltala · Ville Siltala · commit 913b5cf8fbf3 · 2016-09-09T13:09:29.000+03:00
diff --git a/classes/data.php b/classes/data.php
@@ -25,19 +25,16 @@ public static function component_handle( &$data, $fields = false ) {
                             $data[ $key ] = apply_filters( "dustpress/data/component=" . $item["acf_fc_layout"], $item );
                         }
                         else {
-                            $data->{$key} = apply_filters( "dustpress/data/component=" . $item["acf_fc_layout"], $item );   
+                            $data->{$key} = apply_filters( "dustpress/data/component=" . $item["acf_fc_layout"], $item );
                         }
                     }
-                    
+
                     if ( is_array( $data ) ) {
                         self::component_handle( $data[ $key ], true );
                     }
                     else if ( get_class($data) == "stdClass" || get_class($data) == "WP_Post" ) {
                         self::component_handle( $data->{$key}, true );
                     }
-                    else if ( is_object( $data ) ) {
-                        self::component_handle( $data->{$key}, true );
-                    }
                 }
                 else {
                     if ( is_array( $data ) ) {
@@ -46,9 +43,6 @@ public static function component_handle( &$data, $fields = false ) {
                     else if ( get_class($data) == "stdClass" || get_class($data) == "WP_Post" ) {
                         self::component_handle( $data->{$key}, true );
                     }
-                    else if ( is_object( $data ) ) {
-                        self::component_handle( $data->{$key}, true );
-                    }
                 }
             }
         }
diff --git a/dustpress.php b/dustpress.php
@@ -6,7 +6,7 @@
 Author: Miika Arponen & Ville Siltala / Geniem Oy
 Author URI: http://www.geniem.com
 License: GPLv3
-Version: 1.1.20
+Version: 1.1.21
 */
 
 final class DustPress {

Original file line number	Diff line number	Diff line change
`@@ -25,19 +25,16 @@ public static function component_handle( &$data, $fields = false ) {`
`25`	`25`	`$data[ $key ] = apply_filters( "dustpress/data/component=" . $item["acf_fc_layout"], $item );`
`26`	`26`	`}`
`27`	`27`	`else {`
`28`		`- $data->{$key} = apply_filters( "dustpress/data/component=" . $item["acf_fc_layout"], $item );`
	`28`	`+ $data->{$key} = apply_filters( "dustpress/data/component=" . $item["acf_fc_layout"], $item );`
`29`	`29`	`}`
`30`	`30`	`}`
`31`		`-`
	`31`	`+`
`32`	`32`	`if ( is_array( $data ) ) {`
`33`	`33`	`self::component_handle( $data[ $key ], true );`
`34`	`34`	`}`
`35`	`35`	`else if ( get_class($data) == "stdClass" \|\| get_class($data) == "WP_Post" ) {`
`36`	`36`	`self::component_handle( $data->{$key}, true );`
`37`	`37`	`}`
`38`		`- else if ( is_object( $data ) ) {`
`39`		`- self::component_handle( $data->{$key}, true );`
`40`		`- }`
`41`	`38`	`}`
`42`	`39`	`else {`
`43`	`40`	`if ( is_array( $data ) ) {`
`@@ -46,9 +43,6 @@ public static function component_handle( &$data, $fields = false ) {`
`46`	`43`	`else if ( get_class($data) == "stdClass" \|\| get_class($data) == "WP_Post" ) {`
`47`	`44`	`self::component_handle( $data->{$key}, true );`
`48`	`45`	`}`
`49`		`- else if ( is_object( $data ) ) {`
`50`		`- self::component_handle( $data->{$key}, true );`
`51`		`- }`
`52`	`46`	`}`
`53`	`47`	`}`
`54`	`48`	`}`