Changeset 544

Timestamp:

11/07/2006 12:16:18 AM (19 years ago)

Author:

mdawaffe

Message:

More options cleanup. Fixes #478 and #479 and #480

Location:

trunk

Files:

• bb-includes/functions.php (modified) (4 diffs)
• bb-includes/template-functions.php (modified) (2 diffs)
• bb-settings.php (modified) (4 diffs)
• config-sample.php (modified) (2 diffs)
• statistics.php (modified) (1 diff)

trunk/bb-includes/functions.php

@@ -293 +293 @@
 
     switch ( $option ) :
-    case 'url' :
-    case 'uri' :
-        $r = $bb->domain . $bb->path;
-        break;
     case 'language':
         $r = str_replace('_', '-', get_locale());
@@ -307 +303 @@
         return '0.73'; // Don't filter
         break;
+    case 'url' :
+        $option = 'uri';
     default :
-        $option = preg_replace('|[^a-z0-9_]|i', '', $option);
-
         if ( isset($bb->$option) ) {
             $r = $bb->$option;
@@ -315 +311 @@
         }
 
-        global $bbdb, $bb_topic_cache;
-        if ( isset($bb_topic_cache[0]->$option) ) {
-            $r = $bb_topic_cache[0]->$option;
-            if ( is_wp_error( $r ) && 'bb_get_option' == $r->get_error_code() )
-                $r = null; // see WP_Error below
-            break;
-        }
-
+        $r = bb_get_option_from_db( $option );
+        break;
+    endswitch;
+    return apply_filters( 'bb_get_option_' . $option, $r, $option);
+}
+
+function bb_get_option_from_db( $option ) {
+    global $bbdb, $bb_topic_cache;
+    $option = preg_replace('|[^a-z0-9_]|i', '', $option);
+
+    if ( isset($bb_topic_cache[0]->$option) ) {
+        $r = $bb_topic_cache[0]->$option;
+        if ( is_wp_error( $r ) && 'bb_get_option' == $r->get_error_code() )
+            $r = null; // see WP_Error below
+    } else {
         $row = $bbdb->get_row("SELECT meta_value FROM $bbdb->topicmeta WHERE topic_id = 0 AND meta_key = '$option'");
+
         if ( is_object($row) ) {
             $bb_topic_cache[0]->$option = $r = bb_maybe_unserialize( $row->meta_value );
@@ -330 +334 @@
             $bb_topic_cache[0]->$option = new WP_Error( 'bb_get_option' ); // Used internally for caching.  See above.
         }
-        break;
-    endswitch;
-    return apply_filters( 'bb_get_option_' . $option, $r, $option);
+    }
+    return apply_filters( 'bb_get_option_from_db_' . $option, $r, $option );
 }
 

trunk/bb-includes/template-functions.php

@@ -287 +287 @@
 
 function bb_get_title() {
-    global $topic, $forum, $static_title, $tag, $user;
+    global $topic, $forum, $tag, $user;
     $title = '';
     if ( is_topic() )
@@ -297 +297 @@
     if ( is_bb_profile() )
         $title = get_user_name( $user->ID ) . ' « ';
-    if ( !empty($static_title) )
-        $title = $static_title . ' « ';
+    if ( $st = bb_get_option( 'static_title' ) )
+        $title = $st;
     $title .= bb_get_option('name');
     return apply_filters( 'bb_get_title', $title );

trunk/bb-settings.php

@@ -68 +68 @@
 $bbdb->tagged    = $bb_table_prefix . 'tagged';
 
+foreach ( array('use_cache', 'secret', 'debug', 'wp_table_prefix', 'wp_home', 'wp_siteurl', 'cookiedomain', 'static_title', 'load_options') as $o )
+    if ( !isset($bb->$o) )
+        $bb->$o = false;
+unset($o);
+
 require( BBPATH . BBINC . '/functions.php');
 require( BBPATH . BBINC . '/formatting-functions.php');
@@ -94 +99 @@
 $bbdb->show_errors();
 
-$static_title = '';
+if ( $bb->load_options )
+    bb_cache_all_options();
 
 $_GET    = bb_global_sanitize($_GET   );
@@ -116 +122 @@
 define('BBHASH', $bb->wp_siteurl ? md5($bb->wp_siteurl) : md5($bb_table_prefix) );
 
+$bb->uri = $bb->domain . $bb->path;
 if ( !isset( $bb->usercookie ) )
     $bb->usercookie = ( $bb->wp_table_prefix ? 'wordpressuser_' : 'bb_user_' ) . BBHASH;
@@ -121 +128 @@
     $bb->passcookie = ( $bb->wp_table_prefix ? 'wordpresspass_' : 'bb_pass_' ) . BBHASH;
 if ( !isset( $bb->cookiepath ) )
-    $bb->cookiepath = $bb->wp_home ? preg_replace('|https?://[^/]+|i', '', "$bb->wp_home/" ) : bb_get_option('path');
+    $bb->cookiepath = $bb->wp_home ? preg_replace('|https?://[^/]+|i', '', $bb->wp_home . '/' ) : $bb->path;
 if ( !isset( $bb->sitecookiepath ) )
-    $bb->sitecookiepath = $bb->wp_siteurl ? preg_replace('|https?://[^/]+|i', '', "$bb->wp_site/" ) : bb_get_option('path');
+    $bb->sitecookiepath = $bb->wp_siteurl ? preg_replace('|https?://[^/]+|i', '', $bb->wp_siteurl . '/' ) : $bb->path;
 if ( !isset( $bb->tagpath ) )
     $bb->tagpath = $bb->path;

trunk/config-sample.php

@@ -44 +44 @@
 // of Akismet's powerful spam blocking, you'll need one.  You can get an Akismet key at
 // http://wordpress.com/api-keys/
-$bb->akismet_key = false;
+$bb->akismet_key = ''; // Example: '0123456789ab'
 
 
@@ -50 +50 @@
 // If you're not, just leave the rest as it is.
 
-$bb->wp_table_prefix = false;  // WordPress table prefix.  Example: 'wp_';
-$bb->wp_home = false;  // WordPress - Options->General: Blog address (URL) // No trailing slash
-$bb->wp_siteurl = false;  // WordPress - Options->General: WordPress address (URL) // No trailing slash
+$bb->wp_table_prefix = '';  // WordPress table prefix.  Example: 'wp_';
+$bb->wp_home = '';  // WordPress - Options->General: Blog address (URL) // No trailing slash.  Example: 'http://example.com'
+$bb->wp_siteurl = '';  // WordPress - Options->General: WordPress address (URL) // No trailing slash. Example: 'http://example.com'
 
 /* Stop editing */

trunk/statistics.php

@@ -7 +7 @@
 $popular = get_popular_topics();
 
-$static_title = __('Statistics');
+$bb->static_title = __('Statistics') . ' «';
 
 if (file_exists( BBPATH . 'my-templates/stats.php' ))