Changeset 60147

Timestamp:

04/08/2025 06:02:14 PM (3 weeks ago)

Author:

SergeyBiryukov

Message:

General: Correct force_ssl_content() to always return a boolean value.

This aims to bring parity with force_ssl_admin().

Includes:

• Allowing force_ssl_content() to properly accept false as a value.
• Correcting an erroneous ! $force conditional that should have been reversed.
• Adding unit tests to confirm valid behavior.

Follow-up to ​mu:1979, [11903], [12603], [47808], [59830].

Props justlevine for initial patch.
See #52217.

Location:

trunk

Files:

• src/wp-includes/ms-functions.php (modified) (1 diff)
• tests/phpunit/tests/multisite/forceSslContent.php (added)

trunk/src/wp-includes/ms-functions.php

@@ -2421 +2421 @@
  * @since 2.8.5
  *
- * @param bool $force
+ * @param bool|null $force Optional. Whether to force SSL in admin screens. Default null.
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_content( $force = '' ) {
+function force_ssl_content( $force = null ) {
     static $forced_content = false;
 
-    if ( ! $force ) {
+    if ( ! is_null( $force ) ) {
         $old_forced     = $forced_content;
-        $forced_content = $force;
+        $forced_content = (bool) $force;
         return $old_forced;
     }