Changeset 130776

Timestamp:

06/30/2009 12:35:42 PM (16 years ago)

Author:

sambauers

Message:

bbpress-integration: Version 1.0 fix warnings when there are no options set

Location:

bbpress-integration/trunk

Files:

• bbpress-integration.php (modified) (3 diffs)
• readme.txt (modified) (3 diffs)

bbpress-integration/trunk/bbpress-integration.php

@@ -4 +4 @@
 Plugin URI: http://wordpress.org/extend/plugins/bbpress-integration/
 Description: Provides single sign on login with a bbPress installation.
-Version: 1.0-rc-3
+Version: 1.0
 Author: <a href="http://blogwaffe.com/">Michael Adams</a> and <a href="http://unlettered.org">Sam Bauers</a>
 Author URI:
@@ -200 +200 @@
     }
 
-    extract( bbpress_integration_get_cookie_domain_and_path() );
+    if ( !$cookiedomain_and_path = bbpress_integration_get_cookie_domain_and_path() ) {
+        return false;
+    }
+    extract( $cookiedomain_and_path );
 
     $domain = $cookiedomain;
@@ -415 +418 @@
 <?php
     if ( !empty( $uri ) ) {
-        extract( bbpress_integration_get_cookie_domain_and_path() );
-
         $wp_settings = '';
-        if ( $cookiehash ) {
-            $wp_settings .= 'define( \'COOKIEHASH\', \'' . $cookiehash . '\' );' . "\n";
-        }
-        if ( $cookiedomain ) {
-            $wp_settings .= 'define( \'COOKIE_DOMAIN\', \'' . $cookiedomain . '\' );' . "\n";
-        }
-        if ( $sitecookiepath ) {
-            $wp_settings .= 'define( \'SITECOOKIEPATH\', \'' . $sitecookiepath . '\' );' . "\n";
-        }
-        if ( $admincookiepath ) {
-            $wp_settings .= 'define( \'ADMIN_COOKIE_PATH\', \'' . $admincookiepath . '\' );' . "\n";
-        }
-        $wp_settings .= 'define( \'COOKIEPATH\', \'' . $cookiepath . '\' );';
+
+        if ( $cookiedomain_and_path = bbpress_integration_get_cookie_domain_and_path() ) {
+            extract( $cookiedomain_and_path );
+            if ( $cookiehash ) {
+                $wp_settings .= 'define( \'COOKIEHASH\', \'' . $cookiehash . '\' );' . "\n";
+            }
+            if ( $cookiedomain ) {
+                $wp_settings .= 'define( \'COOKIE_DOMAIN\', \'' . $cookiedomain . '\' );' . "\n";
+            }
+            if ( $sitecookiepath ) {
+                $wp_settings .= 'define( \'SITECOOKIEPATH\', \'' . $sitecookiepath . '\' );' . "\n";
+            }
+            if ( $admincookiepath ) {
+                $wp_settings .= 'define( \'ADMIN_COOKIE_PATH\', \'' . $admincookiepath . '\' );' . "\n";
+            }
+            $wp_settings .= 'define( \'COOKIEPATH\', \'' . $cookiepath . '\' );';
+        }
     } else {
         $wp_settings = __( '// Options must be set above for manual cookie settings to appear here.', 'bbpress_integration' );

bbpress-integration/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 2.7
 Tested up to: 2.8
-Stable tag: 1.0-rc-3
+Stable tag: 1.0
 
 Provides single sign on login with a bbPress installation.
@@ -54 +54 @@
 == License ==
 
-bbPress Live version 1.0-rc-3<br />
+bbPress Live version 1.0<br />
 Copyright (C) 2007 Michael Adams (http://blogwaffe.com/)<br />
 Copyright (C) 2009 Sam Bauers (http://unlettered.org/)
@@ -78 +78 @@
 * 1.0-rc-3 :
   <br />Better support and instructions for WordPress 2.7 and WPMU
+* 1.0 :
+  <br />Fix a potential warning when no options are set