WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow force_ssl_admin() to properly accept false as a value. Props nbachiyski. fixes #10706 

git-svn-id: http://svn.automattic.com/wordpress/trunk@11903 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2009-09-08 14:46:06 +00:00
parent 02c7c0e38e
commit 9d1f82b406
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/functions.php
View File

@ -3081,10 +3081,10 @@ function is_ssl() {
* @param string|bool $force Optional. * @param string|bool $force Optional.
* @return bool True if forced, false if not forced. * @return bool True if forced, false if not forced.
*/ */
function force_ssl_login($force = '') { function force_ssl_login( $force = null ) {
static $forced; static $forced = false;
if ( '' != $force ) { if ( !is_null( $force ) ) {
$old_forced = $forced; $old_forced = $forced;
$forced = $force; $forced = $force;
return $old_forced; return $old_forced;
@ -3101,10 +3101,10 @@ function force_ssl_login($force = '') {
* @param string|bool $force * @param string|bool $force
* @return bool True if forced, false if not forced. * @return bool True if forced, false if not forced.
*/ */
function force_ssl_admin($force = '') { function force_ssl_admin( $force = null ) {
static $forced; static $forced = false;
if ( '' != $force ) { if ( !is_null( $force ) ) {
$old_forced = $forced; $old_forced = $forced;
$forced = $force; $forced = $force;
return $old_forced; return $old_forced;