Changeset 132 for trunk

Timestamp:

04/21/08 10:29:34 (9 months ago)

Author:

root

Message:

testing charset DB

Location:

trunk

Files:

• lib/settings.php (modified) (2 diffs)
• wassup.php (modified) (2 diffs)

trunk/lib/settings.php

@@ -104 +104 @@
                 //TODO: Make Top 10 Customizable with up to 10 choices
                 $top_ten = unserialize($wassup_options->wassup_top10);
+                print_r($top_ten);
                 ?>
                 <br /><h3><?php _e('Customize Top Ten List','wassup'); ?></h3>
@@ -116 +117 @@
                 <input type="checkbox" name="topbrowser" value="1" <?php if($top_ten['topbrowser'] == 1) print "CHECKED"; ?> /><?php _e("Top Browsers", "wassup"); ?> <br />
                 <input type="checkbox" name="topos" value="1" <?php if($top_ten['topos'] == 1) print "CHECKED"; ?> /><?php _e("Top OS", "wassup"); ?> <br />
-                <input type="checkbox" name="toplocale" value="1" <?php if($top_ten['topos'] == 1) print "CHECKED"; ?> /><?php _e("Top Locales", "wassup"); ?></span><br />
+                <input type="checkbox" name="toplocale" value="1" <?php if($top_ten['toplocale'] == 1) print "CHECKED"; ?> /><?php _e("Top Locales", "wassup"); ?></span><br />
                 </div>
                 <div style="display:block; vertical-align:top; float:left; width:225px; color:#555;">

trunk/wassup.php

@@ -1116 +1116 @@
 
 function CreateTable($tablename="wassup") {
-        global $wpdb;
-        $table_name = $wpdb->prefix . $tablename;
-        $sql_createtable = "CREATE TABLE " . $table_name . " (
+        global $wpdb;
+        $charset_collate = '';
+        if ( $wpdb->supports_collation() ) {
+                if ( ! empty($wpdb->charset) )
+                        $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+                if ( ! empty($wpdb->collate) )
+                        $charset_collate .= " COLLATE $wpdb->collate";
+        }
+        $table_name = $wpdb->prefix . $tablename;
+        $sql_createtable = "CREATE TABLE " . $table_name . " (
   id mediumint(9) NOT NULL auto_increment,
   wassup_id varchar(50) NOT NULL,
@@ -1142 +1149 @@
   KEY wassup_id (wassup_id),
   INDEX (timestamp)
-);";
-        require_once( ABSPATH.'wp-admin/upgrade-functions.php');
-        dbDelta($sql_createtable);      
+) $charset_collate;";
+        require_once( ABSPATH.'wp-admin/upgrade-functions.php');
+        dbDelta($sql_createtable);
 } //end function createTable