WordPress.org

Make WordPress Core

Ticket #25160: 25160-callables.1.patch

File 25160-callables.1.patch, 32.4 KB (added by jdgrimes, 5 years ago)

First pass at split patch - this one covers array( &$this, 'method' ) calls.

  • src/wp-admin/custom-background.php

     
    6767                if ( ! current_user_can('edit_theme_options') )
    6868                        return;
    6969
    70                 $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array(&$this, 'admin_page'));
     70                $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array($this, 'admin_page'));
    7171
    72                 add_action("load-$page", array(&$this, 'admin_load'));
    73                 add_action("load-$page", array(&$this, 'take_action'), 49);
    74                 add_action("load-$page", array(&$this, 'handle_upload'), 49);
     72                add_action("load-$page", array($this, 'admin_load'));
     73                add_action("load-$page", array($this, 'take_action'), 49);
     74                add_action("load-$page", array($this, 'handle_upload'), 49);
    7575
    7676                if ( $this->admin_header_callback )
    7777                        add_action("admin_head-$page", $this->admin_header_callback, 51);
  • src/wp-admin/custom-header.php

     
    8484                if ( ! current_user_can('edit_theme_options') )
    8585                        return;
    8686
    87                 $this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array(&$this, 'admin_page'));
     87                $this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page'));
    8888
    89                 add_action("admin_print_scripts-$page", array(&$this, 'js_includes'));
    90                 add_action("admin_print_styles-$page", array(&$this, 'css_includes'));
    91                 add_action("admin_head-$page", array(&$this, 'help') );
    92                 add_action("admin_head-$page", array(&$this, 'take_action'), 50);
    93                 add_action("admin_head-$page", array(&$this, 'js'), 50);
     89                add_action("admin_print_scripts-$page", array($this, 'js_includes'));
     90                add_action("admin_print_styles-$page", array($this, 'css_includes'));
     91                add_action("admin_head-$page", array($this, 'help') );
     92                add_action("admin_head-$page", array($this, 'take_action'), 50);
     93                add_action("admin_head-$page", array($this, 'js'), 50);
    9494                if ( $this->admin_header_callback )
    9595                        add_action("admin_head-$page", $this->admin_header_callback, 51);
    9696        }
  • src/wp-admin/includes/class-wp-importer.php

     
    179179         */
    180180        function get_page( $url, $username = '', $password = '', $head = false ) {
    181181                // Increase the timeout
    182                 add_filter( 'http_request_timeout', array( &$this, 'bump_request_timeout' ) );
     182                add_filter( 'http_request_timeout', array( $this, 'bump_request_timeout' ) );
    183183
    184184                $headers = array();
    185185                $args = array();
  • src/wp-admin/includes/class-wp-list-table.php

     
    8787
    8888                $this->screen = convert_to_screen( $args['screen'] );
    8989
    90                 add_filter( "manage_{$this->screen->id}_columns", array( &$this, 'get_columns' ), 0 );
     90                add_filter( "manage_{$this->screen->id}_columns", array( $this, 'get_columns' ), 0 );
    9191
    9292                if ( !$args['plural'] )
    9393                        $args['plural'] = $this->screen->base;
     
    9999
    100100                if ( $args['ajax'] ) {
    101101                        // wp_enqueue_script( 'list-table' );
    102                         add_action( 'admin_footer', array( &$this, '_js_vars' ) );
     102                        add_action( 'admin_footer', array( $this, '_js_vars' ) );
    103103                }
    104104        }
    105105
     
    857857                        }
    858858                        elseif ( method_exists( $this, 'column_' . $column_name ) ) {
    859859                                echo "<td $attributes>";
    860                                 echo call_user_func( array( &$this, 'column_' . $column_name ), $item );
     860                                echo call_user_func( array( $this, 'column_' . $column_name ), $item );
    861861                                echo "</td>";
    862862                        }
    863863                        else {
  • src/wp-admin/includes/class-wp-ms-themes-list-table.php

     
    8484
    8585                if ( $s ) {
    8686                        $status = 'search';
    87                         $themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( &$this, '_search_callback' ) );
     87                        $themes['search'] = array_filter( array_merge( $themes['all'], $themes['broken'] ), array( $this, '_search_callback' ) );
    8888                }
    8989
    9090                $totals = array();
     
    108108                                if ( 'ASC' == $order )
    109109                                        $this->items = array_reverse( $this->items );
    110110                        } else {
    111                                 uasort( $this->items, array( &$this, '_order_callback' ) );
     111                                uasort( $this->items, array( $this, '_order_callback' ) );
    112112                        }
    113113                }
    114114
  • src/wp-admin/includes/class-wp-plugins-list-table.php

     
    9999
    100100                if ( $s ) {
    101101                        $status = 'search';
    102                         $plugins['search'] = array_filter( $plugins['all'], array( &$this, '_search_callback' ) );
     102                        $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) );
    103103                }
    104104
    105105                $totals = array();
     
    121121                        $orderby = ucfirst( $orderby );
    122122                        $order = strtoupper( $order );
    123123
    124                         uasort( $this->items, array( &$this, '_order_callback' ) );
     124                        uasort( $this->items, array( $this, '_order_callback' ) );
    125125                }
    126126
    127127                $plugins_per_page = $this->get_items_per_page( str_replace( '-', '_', $screen->id . '_per_page' ), 999 );
  • src/wp-admin/includes/class-wp-upgrader.php

     
    402402                $this->init();
    403403                $this->install_strings();
    404404
    405                 add_filter('upgrader_source_selection', array(&$this, 'check_package') );
     405                add_filter('upgrader_source_selection', array($this, 'check_package') );
    406406
    407407                $this->run(array(
    408408                                        'package' => $package,
     
    412412                                        'hook_extra' => array()
    413413                                        ));
    414414
    415                 remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
     415                remove_filter('upgrader_source_selection', array($this, 'check_package') );
    416416
    417417                if ( ! $this->result || is_wp_error($this->result) )
    418418                        return $this->result;
     
    442442                // Get the URL to the zip file
    443443                $r = $current->response[ $plugin ];
    444444
    445                 add_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'), 10, 2);
    446                 add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
    447                 //'source_selection' => array(&$this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
     445                add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2);
     446                add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
     447                //'source_selection' => array($this, 'source_selection'), //there's a trac ticket to move up the directory for zip's which are made a bit differently, useful for non-.org plugins.
    448448
    449449                $this->run(array(
    450450                                        'package' => $r->package,
     
    457457                                ));
    458458
    459459                // Cleanup our hooks, in case something else does a upgrade on this connection.
    460                 remove_filter('upgrader_pre_install', array(&$this, 'deactivate_plugin_before_upgrade'));
    461                 remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
     460                remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'));
     461                remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
    462462
    463463                if ( ! $this->result || is_wp_error($this->result) )
    464464                        return $this->result;
     
    477477
    478478                $current = get_site_transient( 'update_plugins' );
    479479
    480                 add_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'), 10, 4);
     480                add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4);
    481481
    482482                $this->skin->header();
    483483
     
    547547                $this->skin->footer();
    548548
    549549                // Cleanup our hooks, in case something else does a upgrade on this connection.
    550                 remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_plugin'));
     550                remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'));
    551551
    552552                // Force refresh of plugin update information
    553553                delete_site_transient('update_plugins');
     
    711711                if ( ! $api || is_wp_error($api) ) {
    712712                        $this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') );
    713713                        // Don't show activate or preview actions after install
    714                         add_filter('install_theme_complete_actions', array(&$this, 'hide_activate_preview_actions') );
     714                        add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
    715715                        return $install_result;
    716716                }
    717717
     
    736736                ) );
    737737
    738738                if ( is_wp_error($parent_result) )
    739                         add_filter('install_theme_complete_actions', array(&$this, 'hide_activate_preview_actions') );
     739                        add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') );
    740740
    741741                // Start cleaning up after the parents installation
    742742                remove_filter('install_theme_complete_actions', '__return_false', 999);
     
    759759                $this->init();
    760760                $this->install_strings();
    761761
    762                 add_filter('upgrader_source_selection', array(&$this, 'check_package') );
    763                 add_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'), 10, 3);
     762                add_filter('upgrader_source_selection', array($this, 'check_package') );
     763                add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3);
    764764
    765765                $options = array(
    766766                        'package' => $package,
     
    771771
    772772                $this->run($options);
    773773
    774                 remove_filter('upgrader_source_selection', array(&$this, 'check_package') );
    775                 remove_filter('upgrader_post_install', array(&$this, 'check_parent_theme_filter'));
     774                remove_filter('upgrader_source_selection', array($this, 'check_package') );
     775                remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'));
    776776
    777777                if ( ! $this->result || is_wp_error($this->result) )
    778778                        return $this->result;
     
    801801
    802802                $r = $current->response[ $theme ];
    803803
    804                 add_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
    805                 add_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
    806                 add_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
     804                add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
     805                add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
     806                add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
    807807
    808808                $options = array(
    809809                        'package' => $r['package'],
     
    817817
    818818                $this->run($options);
    819819
    820                 remove_filter('upgrader_pre_install', array(&$this, 'current_before'));
    821                 remove_filter('upgrader_post_install', array(&$this, 'current_after'));
    822                 remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'));
     820                remove_filter('upgrader_pre_install', array($this, 'current_before'));
     821                remove_filter('upgrader_post_install', array($this, 'current_after'));
     822                remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
    823823
    824824                if ( ! $this->result || is_wp_error($this->result) )
    825825                        return $this->result;
     
    839839
    840840                $current = get_site_transient( 'update_themes' );
    841841
    842                 add_filter('upgrader_pre_install', array(&$this, 'current_before'), 10, 2);
    843                 add_filter('upgrader_post_install', array(&$this, 'current_after'), 10, 2);
    844                 add_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'), 10, 4);
     842                add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2);
     843                add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2);
     844                add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4);
    845845
    846846                $this->skin->header();
    847847
     
    911911                $this->skin->footer();
    912912
    913913                // Cleanup our hooks, in case something else does a upgrade on this connection.
    914                 remove_filter('upgrader_pre_install', array(&$this, 'current_before'));
    915                 remove_filter('upgrader_post_install', array(&$this, 'current_after'));
    916                 remove_filter('upgrader_clear_destination', array(&$this, 'delete_old_theme'));
     914                remove_filter('upgrader_pre_install', array($this, 'current_before'));
     915                remove_filter('upgrader_post_install', array($this, 'current_after'));
     916                remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme'));
    917917
    918918                // Force refresh of theme update information
    919919                wp_clean_themes_cache();
  • src/wp-admin/includes/list-table.php

     
    9595
    9696                if ( !empty( $columns ) ) {
    9797                        $this->_columns = $columns;
    98                         add_filter( 'manage_' . $screen->id . '_columns', array( &$this, 'get_columns' ), 0 );
     98                        add_filter( 'manage_' . $screen->id . '_columns', array( $this, 'get_columns' ), 0 );
    9999                }
    100100        }
    101101
  • tests/includes/utils.php

     
    133133                $this->xml = xml_parser_create();
    134134                xml_set_object($this->xml, $this);
    135135                xml_parser_set_option($this->xml,XML_OPTION_CASE_FOLDING, 0);
    136                 xml_set_element_handler($this->xml, array(&$this, 'startHandler'), array(&$this, 'endHandler'));
    137                 xml_set_character_data_handler($this->xml, array(&$this, 'dataHandler'));
     136                xml_set_element_handler($this->xml, array($this, 'startHandler'), array($this, 'endHandler'));
     137                xml_set_character_data_handler($this->xml, array($this, 'dataHandler'));
    138138                $this->parse($in);
    139139        }
    140140
  • tests/includes/wp-profiler.php

     
    3232
    3333                if (!$this->stack) {
    3434                        // log all actions and filters
    35                         add_filter('all', array(&$this, 'log_filter'));
     35                        add_filter('all', array($this, 'log_filter'));
    3636                }
    3737
    3838                // reset the wpdb queries log, storing it on the profile stack if necessary
     
    101101                }
    102102
    103103                if (!$this->stack) {
    104                         remove_filter('all', array(&$this, 'log_filter'));
     104                        remove_filter('all', array($this, 'log_filter'));
    105105                }
    106106        }
    107107
  • tests/tests/admin/includesTheme.php

     
    1010                $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
    1111                $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
    1212
    13                 add_filter('theme_root', array(&$this, '_theme_root'));
    14                 add_filter( 'stylesheet_root', array(&$this, '_theme_root') );
    15                 add_filter( 'template_root', array(&$this, '_theme_root') );
     13                add_filter('theme_root', array($this, '_theme_root'));
     14                add_filter( 'stylesheet_root', array($this, '_theme_root') );
     15                add_filter( 'template_root', array($this, '_theme_root') );
    1616
    1717                // clear caches
    1818                wp_clean_themes_cache();
     
    2121
    2222        function tearDown() {
    2323                $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
    24                 remove_filter('theme_root', array(&$this, '_theme_root'));
    25                 remove_filter( 'stylesheet_root', array(&$this, '_theme_root') );
    26                 remove_filter( 'template_root', array(&$this, '_theme_root') );
     24                remove_filter('theme_root', array($this, '_theme_root'));
     25                remove_filter( 'stylesheet_root', array($this, '_theme_root') );
     26                remove_filter( 'template_root', array($this, '_theme_root') );
    2727
    2828                wp_clean_themes_cache();
    2929                unset( $GLOBALS['wp_themes'] );
  • tests/tests/filters.php

     
    1212                $tag = rand_str();
    1313                $val = rand_str();
    1414
    15                 add_filter($tag, array(&$a, 'filter'));
     15                add_filter($tag, array($a, 'filter'));
    1616                $this->assertEquals($val, apply_filters($tag, $val));
    1717
    1818                // only one event occurred for the hook, with empty args
     
    2929                $tag = rand_str();
    3030                $val = rand_str();
    3131
    32                 add_filter($tag, array(&$a, 'filter'));
     32                add_filter($tag, array($a, 'filter'));
    3333                $this->assertEquals($val, apply_filters($tag, $val));
    3434
    3535                // make sure our hook was called correctly
     
    3737                $this->assertEquals(array($tag), $a->get_tags());
    3838
    3939                // now remove the filter, do it again, and make sure it's not called this time
    40                 remove_filter($tag, array(&$a, 'filter'));
     40                remove_filter($tag, array($a, 'filter'));
    4141                $this->assertEquals($val, apply_filters($tag, $val));
    4242                $this->assertEquals(1, $a->get_call_count());
    4343                $this->assertEquals(array($tag), $a->get_tags());
     
    6666                $val = rand_str();
    6767
    6868                // add both filters to the hook
    69                 add_filter($tag, array(&$a1, 'filter'));
    70                 add_filter($tag, array(&$a2, 'filter'));
     69                add_filter($tag, array($a1, 'filter'));
     70                add_filter($tag, array($a2, 'filter'));
    7171
    7272                $this->assertEquals($val, apply_filters($tag, $val));
    7373
     
    8282                $val = rand_str();
    8383                $arg1 = rand_str();
    8484
    85                 add_filter($tag, array(&$a, 'filter'), 10, 2);
     85                add_filter($tag, array($a, 'filter'), 10, 2);
    8686                // call the filter with a single argument
    8787                $this->assertEquals($val, apply_filters($tag, $val, $arg1));
    8888
     
    9999                $arg2 = rand_str();
    100100
    101101                // a1 accepts two arguments, a2 doesn't
    102                 add_filter($tag, array(&$a1, 'filter'), 10, 3);
    103                 add_filter($tag, array(&$a2, 'filter'));
     102                add_filter($tag, array($a1, 'filter'), 10, 3);
     103                add_filter($tag, array($a2, 'filter'));
    104104                // call the filter with two arguments
    105105                $this->assertEquals($val, apply_filters($tag, $val, $arg1, $arg2));
    106106
     
    119119                $val = rand_str();
    120120
    121121                // make two filters with different priorities
    122                 add_filter($tag, array(&$a, 'filter'), 10);
    123                 add_filter($tag, array(&$a, 'filter2'), 9);
     122                add_filter($tag, array($a, 'filter'), 10);
     123                add_filter($tag, array($a, 'filter2'), 9);
    124124                $this->assertEquals($val, apply_filters($tag, $val));
    125125
    126126                // there should be two events, one per filter
     
    151151                $val = rand_str();
    152152
    153153                // add an 'all' filter
    154                 add_filter('all', array(&$a, 'filterall'));
     154                add_filter('all', array($a, 'filterall'));
    155155                // do some filters
    156156                $this->assertEquals($val, apply_filters($tag1, $val));
    157157                $this->assertEquals($val, apply_filters($tag2, $val));
     
    163163                // the right hooks should have been called in order
    164164                $this->assertEquals(array($tag1, $tag2, $tag1, $tag1), $a->get_tags());
    165165
    166                 remove_filter('all', array(&$a, 'filterall'));
    167                 $this->assertFalse( has_filter('all', array(&$a, 'filterall')) );
     166                remove_filter('all', array($a, 'filterall'));
     167                $this->assertFalse( has_filter('all', array($a, 'filterall')) );
    168168
    169169        }
    170170
     
    173173                $tag = rand_str();
    174174                $val = rand_str();
    175175
    176                 add_filter('all', array(&$a, 'filterall'));
     176                add_filter('all', array($a, 'filterall'));
    177177                $this->assertTrue( has_filter('all') );
    178                 $this->assertEquals( 10, has_filter('all', array(&$a, 'filterall')) );
     178                $this->assertEquals( 10, has_filter('all', array($a, 'filterall')) );
    179179                $this->assertEquals($val, apply_filters($tag, $val));
    180180
    181181                // make sure our hook was called correctly
     
    183183                $this->assertEquals(array($tag), $a->get_tags());
    184184
    185185                // now remove the filter, do it again, and make sure it's not called this time
    186                 remove_filter('all', array(&$a, 'filterall'));
    187                 $this->assertFalse( has_filter('all', array(&$a, 'filterall')) );
     186                remove_filter('all', array($a, 'filterall'));
     187                $this->assertFalse( has_filter('all', array($a, 'filterall')) );
    188188                $this->assertFalse( has_filter('all') );
    189189                $this->assertEquals($val, apply_filters($tag, $val));
    190190                // call cound should remain at 1
     
    200200                $a = new MockAction();
    201201                $tag = rand_str();
    202202
    203                 add_action($tag, array(&$a, 'filter'));
     203                add_action($tag, array($a, 'filter'));
    204204
    205205                apply_filters_ref_array($tag, array(&$obj));
    206206
     
    220220                $b = new MockAction();
    221221                $tag = rand_str();
    222222
    223                 add_action($tag, array(&$a, 'filter_append'), 10, 2);
    224                 add_action($tag, array(&$b, 'filter_append'), 10, 2);
     223                add_action($tag, array($a, 'filter_append'), 10, 2);
     224                add_action($tag, array($b, 'filter_append'), 10, 2);
    225225
    226226                $result = apply_filters_ref_array($tag, array('string', &$obj));
    227227
     
    242242        }
    243243
    244244        function _self_removal($tag) {
    245                 remove_action( $tag, array(&$this, '_self_removal'), 10, 1 );
     245                remove_action( $tag, array($this, '_self_removal'), 10, 1 );
    246246                return $tag;
    247247        }
    248248
     
    254254                $a = new MockAction();
    255255                $b = new MockAction();
    256256
    257                 add_action( $tag, array(&$a, 'filter_append'), 11, 1 );
    258                 add_action( $tag, array(&$b, 'filter_append'), 12, 1 );
    259                 add_action( $tag, array(&$this, '_self_removal'), 10, 1 );
     257                add_action( $tag, array($a, 'filter_append'), 11, 1 );
     258                add_action( $tag, array($b, 'filter_append'), 12, 1 );
     259                add_action( $tag, array($this, '_self_removal'), 10, 1 );
    260260
    261261                $result = apply_filters($tag, $tag);
    262262                $this->assertEquals( 1, $a->get_call_count(), 'priority 11 filters should run after priority 10 empties itself' );
  • tests/tests/meta.php

     
    1919                $meta = sanitize_meta( 'some_meta', 'unsanitized', 'post' );
    2020                $this->assertEquals( 'unsanitized', $meta );
    2121
    22                 register_meta( 'post', 'some_meta', array( &$this, '_meta_sanitize_cb' ) );
     22                register_meta( 'post', 'some_meta', array( $this, '_meta_sanitize_cb' ) );
    2323                $meta = sanitize_meta( 'some_meta', 'unsanitized', 'post' );
    2424                $this->assertEquals( 'sanitized', $meta );
    2525        }
  • tests/tests/theme/WPTheme.php

     
    1010                $this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
    1111                $GLOBALS['wp_theme_directories'] = array( $this->theme_root );
    1212
    13                 add_filter('theme_root', array(&$this, '_theme_root'));
    14                 add_filter( 'stylesheet_root', array(&$this, '_theme_root') );
    15                 add_filter( 'template_root', array(&$this, '_theme_root') );
     13                add_filter('theme_root', array($this, '_theme_root'));
     14                add_filter( 'stylesheet_root', array($this, '_theme_root') );
     15                add_filter( 'template_root', array($this, '_theme_root') );
    1616                // clear caches
    1717                wp_clean_themes_cache();
    1818                unset( $GLOBALS['wp_themes'] );
     
    2020
    2121        function tearDown() {
    2222                $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
    23                 remove_filter('theme_root', array(&$this, '_theme_root'));
    24                 remove_filter( 'stylesheet_root', array(&$this, '_theme_root') );
    25                 remove_filter( 'template_root', array(&$this, '_theme_root') );
     23                remove_filter('theme_root', array($this, '_theme_root'));
     24                remove_filter( 'stylesheet_root', array($this, '_theme_root') );
     25                remove_filter( 'template_root', array($this, '_theme_root') );
    2626                wp_clean_themes_cache();
    2727                unset( $GLOBALS['wp_themes'] );
    2828                parent::tearDown();
  • tests/tests/theme/themeDir.php

     
    1515                // /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
    1616                $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root );
    1717
    18                 add_filter('theme_root', array(&$this, '_theme_root'));
    19                 add_filter( 'stylesheet_root', array(&$this, '_theme_root') );
    20                 add_filter( 'template_root', array(&$this, '_theme_root') );
     18                add_filter('theme_root', array($this, '_theme_root'));
     19                add_filter( 'stylesheet_root', array($this, '_theme_root') );
     20                add_filter( 'template_root', array($this, '_theme_root') );
    2121                // clear caches
    2222                wp_clean_themes_cache();
    2323                unset( $GLOBALS['wp_themes'] );
     
    2525
    2626        function tearDown() {
    2727                $GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
    28                 remove_filter('theme_root', array(&$this, '_theme_root'));
    29                 remove_filter( 'stylesheet_root', array(&$this, '_theme_root') );
    30                 remove_filter( 'template_root', array(&$this, '_theme_root') );
     28                remove_filter('theme_root', array($this, '_theme_root'));
     29                remove_filter( 'stylesheet_root', array($this, '_theme_root') );
     30                remove_filter( 'template_root', array($this, '_theme_root') );
    3131                wp_clean_themes_cache();
    3232                unset( $GLOBALS['wp_themes'] );
    3333                parent::tearDown();
  • tests/tests/user/capabilities.php

     
    508508                        $this->assertFalse( $admin->has_cap('add_post_meta', $post, '_protected') );
    509509                        $this->assertFalse( $admin->has_cap('delete_post_meta', $post, '_protected') );
    510510
    511                         register_meta( 'post', '_protected', array( &$this, '_meta_filter' ), array( &$this, '_meta_yes_you_can' ) );
     511                        register_meta( 'post', '_protected', array( $this, '_meta_filter' ), array( $this, '_meta_yes_you_can' ) );
    512512                        $this->assertTrue( $admin->has_cap('edit_post_meta',  $post, '_protected') );
    513513                        $this->assertTrue( $admin->has_cap('add_post_meta',  $post, '_protected') );
    514514                        $this->assertTrue( $admin->has_cap('delete_post_meta',  $post, '_protected') );
     
    517517                        $this->assertTrue( $admin->has_cap('add_post_meta', $post, 'not_protected') );
    518518                        $this->assertTrue( $admin->has_cap('delete_post_meta', $post, 'not_protected') );
    519519
    520                         register_meta( 'post', 'not_protected', array( &$this, '_meta_filter' ), array( &$this, '_meta_no_you_cant' ) );
     520                        register_meta( 'post', 'not_protected', array( $this, '_meta_filter' ), array( $this, '_meta_no_you_cant' ) );
    521521                        $this->assertFalse( $admin->has_cap('edit_post_meta',  $post, 'not_protected') );
    522522                        $this->assertFalse( $admin->has_cap('add_post_meta',  $post, 'not_protected') );
    523523                        $this->assertFalse( $admin->has_cap('delete_post_meta',  $post, 'not_protected') );
  • tools/i18n/makepot.php

     
    237237                return $this->wp_generic( $dir, array(
    238238                        'project' => 'wp-core', 'output' => $output,
    239239                        'extract_not_gettexted' => true,
    240                         'not_gettexted_files_filter' => array( &$this, 'is_not_ms_file' ),
     240                        'not_gettexted_files_filter' => array( $this, 'is_not_ms_file' ),
    241241                ) );
    242242        }
    243243
     
    340340                        'includes' => $this->ms_files, 'excludes' => array(),
    341341                        'default_output' => 'wordpress-ms.pot',
    342342                        'extract_not_gettexted' => true,
    343                         'not_gettexted_files_filter' => array( &$this, 'is_ms_file' ),
     343                        'not_gettexted_files_filter' => array( $this, 'is_ms_file' ),
    344344                ) );
    345345                if ( !$ms_result ) {
    346346                        return false;
     
    557557if ($included_files[0] == __FILE__) {
    558558        $makepot = new MakePOT;
    559559        if ((3 == count($argv) || 4 == count($argv)) && in_array($method = str_replace('-', '_', $argv[1]), get_class_methods($makepot))) {
    560                 $res = call_user_func(array(&$makepot, $method), realpath($argv[2]), isset($argv[3])? $argv[3] : null);
     560                $res = call_user_func(array($makepot, $method), realpath($argv[2]), isset($argv[3])? $argv[3] : null);
    561561                if (false === $res) {
    562562                        fwrite(STDERR, "Couldn't generate POT file!\n");
    563563                }
  • tools/i18n/not-gettexted.php

     
    5959                        if ('.' == $item || '..' == $item)
    6060                                continue;
    6161                        if ('.php' == substr($item, -4))
    62                                 $files[] = $full_item; 
     62                                $files[] = $full_item;
    6363                        if (is_dir($full_item))
    6464                                $files += array_merge($files, NotGettexted::list_php_files($full_item, $files));
    6565                }
     
    9999                                                continue;
    100100                                        }
    101101                                        if ($this->STAGE_START_COMMENT <= $stage && $stage <= $this->STAGE_WHITESPACE_AFTER && '/'.$current_comment_id == $matches[1]) {
    102                                                 $stage = $this->STAGE_END_COMMENT; 
     102                                                $stage = $this->STAGE_END_COMMENT;
    103103                                                $this->logmsg('end comment', $current_comment_id);
    104104                                                $result .= call_user_func($other_action, $token);
    105105                                                if (!is_null($register_action)) call_user_func($register_action, $current_string, $current_comment_id, $current_string_line);
     
    152152                foreach($filenames as $filename) {
    153153                        $tokens = token_get_all(file_get_contents($filename));
    154154                        $aggregator = $this->make_string_aggregator($global_name, $filename);
    155                         $this->walk_tokens($tokens, array(&$this, 'ignore_token'), array(&$this, 'ignore_token'), $aggregator);
     155                        $this->walk_tokens($tokens, array($this, 'ignore_token'), array($this, 'ignore_token'), $aggregator);
    156156                }
    157157
    158158                $potf = '-' == $pot_filename? STDOUT : @fopen($pot_filename, 'a');
     
    196196                        $source = file_get_contents($filename);
    197197                        if ( strlen($source) > 150000 ) continue;
    198198                        $tokens = token_get_all($source);
    199                         $new_file = $this->walk_tokens($tokens, $replacer, array(&$this, 'unchanged_token'));
     199                        $new_file = $this->walk_tokens($tokens, $replacer, array($this, 'unchanged_token'));
    200200                        $f = fopen($filename, 'w');
    201201                        fwrite($f, $new_file);
    202202                        fclose($f);
     
    218218                        $this->usage();
    219219                        exit(1);
    220220                }
    221                 call_user_func_array(array(&$this, $this->commands[$argv[1]]), array_slice($argv, 2));
     221                call_user_func_array(array($this, $this->commands[$argv[1]]), array_slice($argv, 2));
    222222        }
    223223}
    224224
  • tools/i18n/pot-ext-meta.php

     
    5151                if ( $headers )
    5252                        $this->headers = (array) $headers;
    5353                if ( is_dir( $ext_filename ) ) {
    54                         $pot = implode('', array_map(array(&$this, 'load_from_file'), glob("$ext_filename/*.php")));
     54                        $pot = implode('', array_map(array($this, 'load_from_file'), glob("$ext_filename/*.php")));
    5555                } else {
    5656                        $pot = $this->load_from_file($ext_filename);
    5757                }
  • tools/i18n/t/NotGettextedTest.php

     
    99require_once dirname( dirname( __FILE__ ) ) . '/not-gettexted.php';
    1010
    1111class NotGettextedTest extends PHPUnit_Framework_TestCase {
    12        
     12
    1313        function __construct() {
    1414                $this->ng = new NotGettexted;
    1515        }
    16        
     16
    1717        function test_make_string_aggregator() {
    1818                global $baba;
    1919                $f = $this->ng->make_string_aggregator( 'baba', 'baba.php' );
     
    2929echo /* WP_I18N_GUGU*/  "yes" /* /WP_I18N_UGU           */;
    3030        if ($x == "18181") { wp_die(sprintf(/*WP_I18N_DIE*/\'We died %d times!\'/*WP_I18N_DIE*/)); }
    3131?>';
    32                 $tokens = token_get_all($code); 
    33                 $this->assertEquals( '', $this->ng->walk_tokens( $tokens, array(&$this->ng, 'ignore_token'), array(&$this->ng, 'ignore_token') ) );
    34                 $this->assertEquals( '"yes"\'We died %d times!\'', $this->ng->walk_tokens( $tokens, array(&$this->ng, 'unchanged_token'), array(&$this->ng, 'ignore_token') ) );
    35                 $this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array(&$this->ng, 'unchanged_token'), array(&$this->ng, 'unchanged_token') ) );
    36                 $this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array(&$this->ng, 'unchanged_token'), array(&$this->ng, 'unchanged_token') ) );
     32                $tokens = token_get_all($code);
     33                $this->assertEquals( '', $this->ng->walk_tokens( $tokens, array($this->ng, 'ignore_token'), array($this->ng, 'ignore_token') ) );
     34                $this->assertEquals( '"yes"\'We died %d times!\'', $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'ignore_token') ) );
     35                $this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
     36                $this->assertEquals( $code, $this->ng->walk_tokens( $tokens, array($this->ng, 'unchanged_token'), array($this->ng, 'unchanged_token') ) );
    3737        }
    3838
    3939        function test_replace() {
     
    4343                $this->assertEquals( file_get_contents( 'data/not-gettexted-0-result.php' ), file_get_contents( 'data/not-gettexted-0-work.php' ) );
    4444                unlink( 'data/not-gettexted-0-work.php' );
    4545        }
    46 }
    47  No newline at end of file
     46}