Changeset 2448

Timestamp:

06/28/2010 07:24:26 PM (16 years ago)

Author:

chrishajer

Message:

Attempt to fix "double slash" issue when deep integrating with WordPress 3.0 (only.) Fixes #1194. Props GautamGupta

Location:

trunk

Files:

• bb-includes/functions.bb-meta.php (modified) (1 diff)
• bb-settings.php (modified) (1 diff)

trunk/bb-includes/functions.bb-meta.php

@@ -298 +298 @@
             break;
         case 'version':
-            return '1.1-alpha-2447'; // Don't filter
+            return '1.1-alpha-2448'; // Don't filter
             break;
         case 'bb_db_version' :

trunk/bb-settings.php

@@ -480 +480 @@
 require_once( BB_PATH . BB_INC . 'functions.bb-script-loader.php' );
 
-// Sanitise external input
-$_GET    = bb_global_sanitize( $_GET );
-$_POST   = bb_global_sanitize( $_POST );
-$_COOKIE = bb_global_sanitize( $_COOKIE, false );
-$_SERVER = bb_global_sanitize( $_SERVER );
-
+/* Check if the globals have been sanitized by WordPress or not (else there would be extra slashes while deep integration) */
+if ( !function_exists( 'wp_magic_quotes' ) ) {
+    // Sanitise external input
+    $_GET    = bb_global_sanitize( $_GET );
+    $_POST   = bb_global_sanitize( $_POST );
+    $_COOKIE = bb_global_sanitize( $_COOKIE, false );
+    $_SERVER = bb_global_sanitize( $_SERVER );
+}