Changeset 5827 for trunk/src/includes/admin/converter.php

Timestamp:

07/14/2015 12:31:42 AM (11 years ago)

Author:

johnjamesjacoby

Message:

Abstraction: Use bbp_db(), bbp_rewrite() & friends, introduced in r5823 & r5826.

This commit improves the stability of bbPress in the WordPress environment by reducing global variable exposure. It also comes with minimal opcode improvements in some circumstances where $GLOBALS is preferred over defining via global statements.

Some additional surrounding cleanup directly related to functions & methods being altered is also being performed here.

Fixes #2786.

File:

• trunk/src/includes/admin/converter.php (modified) (3 diffs)

trunk/src/includes/admin/converter.php

@@ -630 +630 @@
      */
     public function sync_table( $drop = false ) {
-        global $wpdb;
-
-        $table_name = $wpdb->prefix . 'bbp_converter_translator';
-        if ( ! empty( $drop ) && $wpdb->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
-            $wpdb->query( "DROP TABLE {$table_name}" );
+
+        $bbp_db     = bbp_db();
+        $table_name = $bbp_db->prefix . 'bbp_converter_translator';
+        if ( ! empty( $drop ) && $bbp_db->get_var( "SHOW TABLES LIKE '{$table_name}'" ) == $table_name ) {
+            $bbp_db->query( "DROP TABLE {$table_name}" );
         }
 
         require_once( ABSPATH . '/wp-admin/includes/upgrade.php' );
 
-        if ( !empty( $wpdb->charset ) ) {
-            $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
-        }
-
-        if ( !empty( $wpdb->collate ) ) {
-            $charset_collate .= " COLLATE $wpdb->collate";
+        if ( !empty( $bbp_db->charset ) ) {
+            $charset_collate = "DEFAULT CHARACTER SET $bbp_db->charset";
+        }
+
+        if ( !empty( $bbp_db->collate ) ) {
+            $charset_collate .= " COLLATE $bbp_db->collate";
         }
 
@@ -676 +676 @@
 
     /**
-     * @var object This is the connection to the WordPress datbase.
+     * @var object This is the connection to the WordPress database.
      */
     protected $wpdb;
@@ -740 +740 @@
 
     private function setup_globals() {
-        global $wpdb;
 
         /** Get database connections ******************************************/
 
-        $this->wpdb         = $wpdb;
+        $this->wpdb         = bbp_db();
         $this->max_rows     = (int) $_POST['_bbp_converter_rows'];
         $this->opdb         = new wpdb( $_POST['_bbp_converter_db_user'], $_POST['_bbp_converter_db_pass'], $_POST['_bbp_converter_db_name'], $_POST['_bbp_converter_db_server'] );