Changeset 5908 for trunk/src/includes/core/theme-compat.php
- Timestamp:
- 08/11/2015 08:17:53 PM (11 years ago)
- File:
-
- 1 edited
-
trunk/src/includes/core/theme-compat.php (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/includes/core/theme-compat.php
r5829 r5908 69 69 */ 70 70 public function __set( $property, $value ) { 71 return $this->_data[ $property] = $value;71 return $this->_data[ $property ] = $value; 72 72 } 73 73 … … 81 81 */ 82 82 public function __get( $property ) { 83 return array_key_exists( $property, $this->_data ) ? $this->_data[$property] : ''; 83 return array_key_exists( $property, $this->_data ) 84 ? $this->_data[ $property ] 85 : ''; 84 86 } 85 87 } … … 97 99 98 100 // Make sure theme package is available, set to default if not 99 if ( ! isset( $bbp->theme_compat->packages[ $theme] ) || ! is_a( $bbp->theme_compat->packages[$theme], 'BBP_Theme_Compat' ) ) {101 if ( ! isset( $bbp->theme_compat->packages[ $theme ] ) || ! is_a( $bbp->theme_compat->packages[ $theme ], 'BBP_Theme_Compat' ) ) { 100 102 $theme = 'default'; 101 103 } … … 103 105 // Try to set the active theme compat theme. If it's not in the registered 104 106 // packages array, it doesn't exist, so do nothing with it. 105 if ( isset( $bbp->theme_compat->packages[ $theme] ) ) {106 $bbp->theme_compat->theme = $bbp->theme_compat->packages[ $theme];107 if ( isset( $bbp->theme_compat->packages[ $theme ] ) ) { 108 $bbp->theme_compat->theme = $bbp->theme_compat->packages[ $theme ]; 107 109 } 108 110 } … … 289 291 290 292 // Only override if the flag is set and not previously registered 291 if ( empty( $bbp->theme_compat->packages[ $theme->id] ) || ( true === $override ) ) {292 $bbp->theme_compat->packages[ $theme->id] = $theme;293 if ( empty( $bbp->theme_compat->packages[ $theme->id ] ) || ( true === $override ) ) { 294 $bbp->theme_compat->packages[ $theme->id ] = $theme; 293 295 } 294 296 } … … 874 876 875 877 // Filters exist 876 if ( isset( $wp_filter[ $tag] ) ) {878 if ( isset( $wp_filter[ $tag ] ) ) { 877 879 878 880 // Filters exist in this priority 879 if ( ! empty( $priority ) && isset( $wp_filter[ $tag][$priority] ) ) {881 if ( ! empty( $priority ) && isset( $wp_filter[ $tag ][ $priority ] ) ) { 880 882 881 883 // Store filters in a backup 882 $bbp->filters->wp_filter[ $tag][$priority] = $wp_filter[$tag][$priority];884 $bbp->filters->wp_filter[ $tag ][ $priority ] = $wp_filter[ $tag ][ $priority ]; 883 885 884 886 // Unset the filters 885 unset( $wp_filter[ $tag][$priority] );887 unset( $wp_filter[ $tag ][ $priority ] ); 886 888 887 889 // Priority is empty … … 889 891 890 892 // Store filters in a backup 891 $bbp->filters->wp_filter[ $tag] = $wp_filter[$tag];893 $bbp->filters->wp_filter[ $tag ] = $wp_filter[ $tag ]; 892 894 893 895 // Unset the filters 894 unset( $wp_filter[ $tag] );896 unset( $wp_filter[ $tag ] ); 895 897 } 896 898 } 897 899 898 900 // Check merged filters 899 if ( isset( $merged_filters[ $tag] ) ) {901 if ( isset( $merged_filters[ $tag ] ) ) { 900 902 901 903 // Store filters in a backup 902 $bbp->filters->merged_filters[ $tag] = $merged_filters[$tag];904 $bbp->filters->merged_filters[ $tag ] = $merged_filters[ $tag ]; 903 905 904 906 // Unset the filters 905 unset( $merged_filters[ $tag] );907 unset( $merged_filters[ $tag ] ); 906 908 } 907 909 … … 926 928 927 929 // Filters exist 928 if ( isset( $bbp->filters->wp_filter[ $tag] ) ) {930 if ( isset( $bbp->filters->wp_filter[ $tag ] ) ) { 929 931 930 932 // Filters exist in this priority 931 if ( ! empty( $priority ) && isset( $bbp->filters->wp_filter[ $tag][$priority] ) ) {933 if ( ! empty( $priority ) && isset( $bbp->filters->wp_filter[ $tag ][ $priority ] ) ) { 932 934 933 935 // Store filters in a backup 934 $wp_filter[ $tag][$priority] = $bbp->filters->wp_filter[$tag][$priority];936 $wp_filter[ $tag ][ $priority ] = $bbp->filters->wp_filter[ $tag ][ $priority ]; 935 937 936 938 // Unset the filters 937 unset( $bbp->filters->wp_filter[ $tag][$priority] );939 unset( $bbp->filters->wp_filter[ $tag ][ $priority ] ); 938 940 939 941 // Priority is empty … … 941 943 942 944 // Store filters in a backup 943 $wp_filter[ $tag] = $bbp->filters->wp_filter[$tag];945 $wp_filter[ $tag ] = $bbp->filters->wp_filter[ $tag ]; 944 946 945 947 // Unset the filters 946 unset( $bbp->filters->wp_filter[ $tag] );948 unset( $bbp->filters->wp_filter[ $tag ] ); 947 949 } 948 950 } 949 951 950 952 // Check merged filters 951 if ( isset( $bbp->filters->merged_filters[ $tag] ) ) {953 if ( isset( $bbp->filters->merged_filters[ $tag ] ) ) { 952 954 953 955 // Store filters in a backup 954 $merged_filters[ $tag] = $bbp->filters->merged_filters[$tag];956 $merged_filters[ $tag ] = $bbp->filters->merged_filters[ $tag ]; 955 957 956 958 // Unset the filters 957 unset( $bbp->filters->merged_filters[ $tag] );959 unset( $bbp->filters->merged_filters[ $tag ] ); 958 960 } 959 961
Note: See TracChangeset
for help on using the changeset viewer.