Changeset 25254
- Timestamp:
- 09/05/2013 04:33:50 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 20 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/custom-background.php
r24630 r25254 68 68 return; 69 69 70 $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array( &$this, 'admin_page'));71 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);70 $this->page = $page = add_theme_page(__('Background'), __('Background'), 'edit_theme_options', 'custom-background', array($this, 'admin_page')); 71 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); 75 75 76 76 if ( $this->admin_header_callback ) -
trunk/src/wp-admin/custom-header.php
r25135 r25254 85 85 return; 86 86 87 $this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array( &$this, 'admin_page'));88 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);87 $this->page = $page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page')); 88 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); 94 94 if ( $this->admin_header_callback ) 95 95 add_action("admin_head-$page", $this->admin_header_callback, 51); -
trunk/src/wp-admin/includes/class-wp-importer.php
r24917 r25254 180 180 function get_page( $url, $username = '', $password = '', $head = false ) { 181 181 // 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' ) ); 183 183 184 184 $headers = array(); -
trunk/src/wp-admin/includes/class-wp-list-table.php
r24123 r25254 88 88 $this->screen = convert_to_screen( $args['screen'] ); 89 89 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 ); 91 91 92 92 if ( !$args['plural'] ) … … 100 100 if ( $args['ajax'] ) { 101 101 // wp_enqueue_script( 'list-table' ); 102 add_action( 'admin_footer', array( &$this, '_js_vars' ) );102 add_action( 'admin_footer', array( $this, '_js_vars' ) ); 103 103 } 104 104 } … … 858 858 elseif ( method_exists( $this, 'column_' . $column_name ) ) { 859 859 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 ); 861 861 echo "</td>"; 862 862 } -
trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php
r25032 r25254 85 85 if ( $s ) { 86 86 $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' ) ); 88 88 } 89 89 … … 109 109 $this->items = array_reverse( $this->items ); 110 110 } else { 111 uasort( $this->items, array( &$this, '_order_callback' ) );111 uasort( $this->items, array( $this, '_order_callback' ) ); 112 112 } 113 113 } -
trunk/src/wp-admin/includes/class-wp-plugins-list-table.php
r24583 r25254 100 100 if ( $s ) { 101 101 $status = 'search'; 102 $plugins['search'] = array_filter( $plugins['all'], array( &$this, '_search_callback' ) );102 $plugins['search'] = array_filter( $plugins['all'], array( $this, '_search_callback' ) ); 103 103 } 104 104 … … 122 122 $order = strtoupper( $order ); 123 123 124 uasort( $this->items, array( &$this, '_order_callback' ) );124 uasort( $this->items, array( $this, '_order_callback' ) ); 125 125 } 126 126 -
trunk/src/wp-admin/includes/class-wp-upgrader.php
r25227 r25254 404 404 $this->install_strings(); 405 405 406 add_filter('upgrader_source_selection', array( &$this, 'check_package') );406 add_filter('upgrader_source_selection', array($this, 'check_package') ); 407 407 408 408 $this->run(array( … … 414 414 )); 415 415 416 remove_filter('upgrader_source_selection', array( &$this, 'check_package') );416 remove_filter('upgrader_source_selection', array($this, 'check_package') ); 417 417 418 418 if ( ! $this->result || is_wp_error($this->result) ) … … 444 444 $r = $current->response[ $plugin ]; 445 445 446 add_filter('upgrader_pre_install', array( &$this, 'deactivate_plugin_before_upgrade'), 10, 2);447 add_filter('upgrader_clear_destination', array( &$this, 'delete_old_plugin'), 10, 4);448 //'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.446 add_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade'), 10, 2); 447 add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4); 448 //'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. 449 449 450 450 $this->run(array( … … 459 459 460 460 // Cleanup our hooks, in case something else does a upgrade on this connection. 461 remove_filter('upgrader_pre_install', array( &$this, 'deactivate_plugin_before_upgrade'));462 remove_filter('upgrader_clear_destination', array( &$this, 'delete_old_plugin'));461 remove_filter('upgrader_pre_install', array($this, 'deactivate_plugin_before_upgrade')); 462 remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin')); 463 463 464 464 if ( ! $this->result || is_wp_error($this->result) ) … … 481 481 $current = get_site_transient( 'update_plugins' ); 482 482 483 add_filter('upgrader_clear_destination', array( &$this, 'delete_old_plugin'), 10, 4);483 add_filter('upgrader_clear_destination', array($this, 'delete_old_plugin'), 10, 4); 484 484 485 485 $this->skin->header(); … … 551 551 552 552 // Cleanup our hooks, in case something else does a upgrade on this connection. 553 remove_filter('upgrader_clear_destination', array( &$this, 'delete_old_plugin'));553 remove_filter('upgrader_clear_destination', array($this, 'delete_old_plugin')); 554 554 555 555 // Force refresh of plugin update information … … 713 713 $this->skin->feedback( 'parent_theme_not_found', $theme_info->get('Template') ); 714 714 // Don't show activate or preview actions after install 715 add_filter('install_theme_complete_actions', array( &$this, 'hide_activate_preview_actions') );715 add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') ); 716 716 return $install_result; 717 717 } … … 738 738 739 739 if ( is_wp_error($parent_result) ) 740 add_filter('install_theme_complete_actions', array( &$this, 'hide_activate_preview_actions') );740 add_filter('install_theme_complete_actions', array($this, 'hide_activate_preview_actions') ); 741 741 742 742 // Start cleaning up after the parents installation … … 761 761 $this->install_strings(); 762 762 763 add_filter('upgrader_source_selection', array( &$this, 'check_package') );764 add_filter('upgrader_post_install', array( &$this, 'check_parent_theme_filter'), 10, 3);763 add_filter('upgrader_source_selection', array($this, 'check_package') ); 764 add_filter('upgrader_post_install', array($this, 'check_parent_theme_filter'), 10, 3); 765 765 766 766 $options = array( … … 773 773 $this->run($options); 774 774 775 remove_filter('upgrader_source_selection', array( &$this, 'check_package') );776 remove_filter('upgrader_post_install', array( &$this, 'check_parent_theme_filter'));775 remove_filter('upgrader_source_selection', array($this, 'check_package') ); 776 remove_filter('upgrader_post_install', array($this, 'check_parent_theme_filter')); 777 777 778 778 if ( ! $this->result || is_wp_error($this->result) ) … … 803 803 $r = $current->response[ $theme ]; 804 804 805 add_filter('upgrader_pre_install', array( &$this, 'current_before'), 10, 2);806 add_filter('upgrader_post_install', array( &$this, 'current_after'), 10, 2);807 add_filter('upgrader_clear_destination', array( &$this, 'delete_old_theme'), 10, 4);805 add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2); 806 add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2); 807 add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4); 808 808 809 809 $options = array( … … 819 819 $this->run($options); 820 820 821 remove_filter('upgrader_pre_install', array( &$this, 'current_before'));822 remove_filter('upgrader_post_install', array( &$this, 'current_after'));823 remove_filter('upgrader_clear_destination', array( &$this, 'delete_old_theme'));821 remove_filter('upgrader_pre_install', array($this, 'current_before')); 822 remove_filter('upgrader_post_install', array($this, 'current_after')); 823 remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme')); 824 824 825 825 if ( ! $this->result || is_wp_error($this->result) ) … … 841 841 $current = get_site_transient( 'update_themes' ); 842 842 843 add_filter('upgrader_pre_install', array( &$this, 'current_before'), 10, 2);844 add_filter('upgrader_post_install', array( &$this, 'current_after'), 10, 2);845 add_filter('upgrader_clear_destination', array( &$this, 'delete_old_theme'), 10, 4);843 add_filter('upgrader_pre_install', array($this, 'current_before'), 10, 2); 844 add_filter('upgrader_post_install', array($this, 'current_after'), 10, 2); 845 add_filter('upgrader_clear_destination', array($this, 'delete_old_theme'), 10, 4); 846 846 847 847 $this->skin->header(); … … 913 913 914 914 // Cleanup our hooks, in case something else does a upgrade on this connection. 915 remove_filter('upgrader_pre_install', array( &$this, 'current_before'));916 remove_filter('upgrader_post_install', array( &$this, 'current_after'));917 remove_filter('upgrader_clear_destination', array( &$this, 'delete_old_theme'));915 remove_filter('upgrader_pre_install', array($this, 'current_before')); 916 remove_filter('upgrader_post_install', array($this, 'current_after')); 917 remove_filter('upgrader_clear_destination', array($this, 'delete_old_theme')); 918 918 919 919 // Force refresh of theme update information -
trunk/src/wp-admin/includes/list-table.php
r22838 r25254 96 96 if ( !empty( $columns ) ) { 97 97 $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 ); 99 99 } 100 100 } -
trunk/tests/phpunit/includes/utils.php
r25002 r25254 134 134 xml_set_object($this->xml, $this); 135 135 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')); 138 138 $this->parse($in); 139 139 } -
trunk/tests/phpunit/includes/wp-profiler.php
r25002 r25254 33 33 if (!$this->stack) { 34 34 // log all actions and filters 35 add_filter('all', array( &$this, 'log_filter'));35 add_filter('all', array($this, 'log_filter')); 36 36 } 37 37 … … 102 102 103 103 if (!$this->stack) { 104 remove_filter('all', array( &$this, 'log_filter'));104 remove_filter('all', array($this, 'log_filter')); 105 105 } 106 106 } -
trunk/tests/phpunit/tests/admin/includesTheme.php
r25002 r25254 11 11 $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root ); 12 12 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') ); 16 16 17 17 // clear caches … … 22 22 function tearDown() { 23 23 $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') ); 27 27 28 28 wp_clean_themes_cache(); -
trunk/tests/phpunit/tests/filters.php
r25002 r25254 13 13 $val = rand_str(); 14 14 15 add_filter($tag, array( &$a, 'filter'));15 add_filter($tag, array($a, 'filter')); 16 16 $this->assertEquals($val, apply_filters($tag, $val)); 17 17 … … 30 30 $val = rand_str(); 31 31 32 add_filter($tag, array( &$a, 'filter'));32 add_filter($tag, array($a, 'filter')); 33 33 $this->assertEquals($val, apply_filters($tag, $val)); 34 34 … … 38 38 39 39 // 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')); 41 41 $this->assertEquals($val, apply_filters($tag, $val)); 42 42 $this->assertEquals(1, $a->get_call_count()); … … 67 67 68 68 // 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')); 71 71 72 72 $this->assertEquals($val, apply_filters($tag, $val)); … … 83 83 $arg1 = rand_str(); 84 84 85 add_filter($tag, array( &$a, 'filter'), 10, 2);85 add_filter($tag, array($a, 'filter'), 10, 2); 86 86 // call the filter with a single argument 87 87 $this->assertEquals($val, apply_filters($tag, $val, $arg1)); … … 100 100 101 101 // 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')); 104 104 // call the filter with two arguments 105 105 $this->assertEquals($val, apply_filters($tag, $val, $arg1, $arg2)); … … 120 120 121 121 // 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); 124 124 $this->assertEquals($val, apply_filters($tag, $val)); 125 125 … … 152 152 153 153 // add an 'all' filter 154 add_filter('all', array( &$a, 'filterall'));154 add_filter('all', array($a, 'filterall')); 155 155 // do some filters 156 156 $this->assertEquals($val, apply_filters($tag1, $val)); … … 164 164 $this->assertEquals(array($tag1, $tag2, $tag1, $tag1), $a->get_tags()); 165 165 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')) ); 168 168 169 169 } … … 174 174 $val = rand_str(); 175 175 176 add_filter('all', array( &$a, 'filterall'));176 add_filter('all', array($a, 'filterall')); 177 177 $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')) ); 179 179 $this->assertEquals($val, apply_filters($tag, $val)); 180 180 … … 184 184 185 185 // 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')) ); 188 188 $this->assertFalse( has_filter('all') ); 189 189 $this->assertEquals($val, apply_filters($tag, $val)); … … 201 201 $tag = rand_str(); 202 202 203 add_action($tag, array( &$a, 'filter'));203 add_action($tag, array($a, 'filter')); 204 204 205 205 apply_filters_ref_array($tag, array(&$obj)); … … 221 221 $tag = rand_str(); 222 222 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); 225 225 226 226 $result = apply_filters_ref_array($tag, array('string', &$obj)); … … 243 243 244 244 function _self_removal($tag) { 245 remove_action( $tag, array( &$this, '_self_removal'), 10, 1 );245 remove_action( $tag, array($this, '_self_removal'), 10, 1 ); 246 246 return $tag; 247 247 } … … 255 255 $b = new MockAction(); 256 256 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 ); 260 260 261 261 $result = apply_filters($tag, $tag); -
trunk/tests/phpunit/tests/meta.php
r25002 r25254 20 20 $this->assertEquals( 'unsanitized', $meta ); 21 21 22 register_meta( 'post', 'some_meta', array( &$this, '_meta_sanitize_cb' ) );22 register_meta( 'post', 'some_meta', array( $this, '_meta_sanitize_cb' ) ); 23 23 $meta = sanitize_meta( 'some_meta', 'unsanitized', 'post' ); 24 24 $this->assertEquals( 'sanitized', $meta ); -
trunk/tests/phpunit/tests/theme/WPTheme.php
r25002 r25254 11 11 $GLOBALS['wp_theme_directories'] = array( $this->theme_root ); 12 12 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') ); 16 16 // clear caches 17 17 wp_clean_themes_cache(); … … 21 21 function tearDown() { 22 22 $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') ); 26 26 wp_clean_themes_cache(); 27 27 unset( $GLOBALS['wp_themes'] ); -
trunk/tests/phpunit/tests/theme/themeDir.php
r25002 r25254 16 16 $GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', $this->theme_root ); 17 17 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') ); 21 21 // clear caches 22 22 wp_clean_themes_cache(); … … 26 26 function tearDown() { 27 27 $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') ); 31 31 wp_clean_themes_cache(); 32 32 unset( $GLOBALS['wp_themes'] ); -
trunk/tests/phpunit/tests/user/capabilities.php
r25002 r25254 509 509 $this->assertFalse( $admin->has_cap('delete_post_meta', $post, '_protected') ); 510 510 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' ) ); 512 512 $this->assertTrue( $admin->has_cap('edit_post_meta', $post, '_protected') ); 513 513 $this->assertTrue( $admin->has_cap('add_post_meta', $post, '_protected') ); … … 518 518 $this->assertTrue( $admin->has_cap('delete_post_meta', $post, 'not_protected') ); 519 519 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' ) ); 521 521 $this->assertFalse( $admin->has_cap('edit_post_meta', $post, 'not_protected') ); 522 522 $this->assertFalse( $admin->has_cap('add_post_meta', $post, 'not_protected') ); -
trunk/tools/i18n/makepot.php
r25096 r25254 238 238 'project' => 'wp-core', 'output' => $output, 239 239 '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' ), 241 241 ) ); 242 242 } … … 341 341 'default_output' => 'wordpress-ms.pot', 342 342 'extract_not_gettexted' => true, 343 'not_gettexted_files_filter' => array( &$this, 'is_ms_file' ),343 'not_gettexted_files_filter' => array( $this, 'is_ms_file' ), 344 344 ) ); 345 345 if ( !$ms_result ) { … … 558 558 $makepot = new MakePOT; 559 559 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); 561 561 if (false === $res) { 562 562 fwrite(STDERR, "Couldn't generate POT file!\n"); -
trunk/tools/i18n/not-gettexted.php
r25003 r25254 60 60 continue; 61 61 if ('.php' == substr($item, -4)) 62 $files[] = $full_item; 62 $files[] = $full_item; 63 63 if (is_dir($full_item)) 64 64 $files += array_merge($files, NotGettexted::list_php_files($full_item, $files)); … … 100 100 } 101 101 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; 103 103 $this->logmsg('end comment', $current_comment_id); 104 104 $result .= call_user_func($other_action, $token); … … 153 153 $tokens = token_get_all(file_get_contents($filename)); 154 154 $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); 156 156 } 157 157 … … 197 197 if ( strlen($source) > 150000 ) continue; 198 198 $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')); 200 200 $f = fopen($filename, 'w'); 201 201 fwrite($f, $new_file); … … 219 219 exit(1); 220 220 } 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)); 222 222 } 223 223 } -
trunk/tools/i18n/pot-ext-meta.php
r25003 r25254 52 52 $this->headers = (array) $headers; 53 53 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"))); 55 55 } else { 56 56 $pot = $this->load_from_file($ext_filename); -
trunk/tools/i18n/t/NotGettextedTest.php
r25003 r25254 10 10 11 11 class NotGettextedTest extends PHPUnit_Framework_TestCase { 12 12 13 13 function __construct() { 14 14 $this->ng = new NotGettexted; 15 15 } 16 16 17 17 function test_make_string_aggregator() { 18 18 global $baba; … … 30 30 if ($x == "18181") { wp_die(sprintf(/*WP_I18N_DIE*/\'We died %d times!\'/*WP_I18N_DIE*/)); } 31 31 ?>'; 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') ) ); 37 37 } 38 38
Note: See TracChangeset
for help on using the changeset viewer.