WordPress.org

Make WordPress Core

Changeset 34703


Ignore:
Timestamp:
09/29/2015 09:43:04 PM (5 years ago)
Author:
johnbillion
Message:

force_ssl_login() has been functionally identical to force_ssl_admin() since 4.0 (#10267), so its test assertions can be removed as the function has been deprecated in [34700]. The remaining assertions suitably cover force_ssl_admin().

See #34011

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/tests/phpunit/tests/url.php

    r31302 r34703  
    241241
    242242        $forced_admin = force_ssl_admin();
    243         $forced_login = force_ssl_login();
    244243        $i = 0;
    245244        foreach ( $links as $link ) {
     
    254253            $this->assertEquals( $http_links[ $i ], set_url_scheme( $link ) );
    255254
    256             force_ssl_login( false );
    257255            force_ssl_admin( true );
    258256            $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'admin' ) );
     
    267265            $this->assertEquals( $http_links[ $i ], set_url_scheme( $link, 'rpc' ) );
    268266
    269             force_ssl_login( true );
    270             $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'admin' ) );
    271             $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'login_post' ) );
    272             $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'login' ) );
    273             $this->assertEquals( $https_links[ $i ], set_url_scheme( $link, 'rpc' ) );
    274 
    275267            $i++;
    276268        }
    277269
    278270        force_ssl_admin( $forced_admin );
    279         force_ssl_login( $forced_login );
    280271    }
    281272
Note: See TracChangeset for help on using the changeset viewer.