Skip to:
Content

bbPress.org


Ignore:
Timestamp:
12/28/2016 04:24:52 AM (9 years ago)
Author:
johnjamesjacoby
Message:

Audit direct query and prepare() usages, and more tightly adhere to best practices.

  • No quotes around directives
  • Avoid concatenation, prefer variable parsing in double-quoted strings
  • Covers converters, helper functions, and tools
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/includes/admin/tools.php

    r6189 r6191  
    10901090                WHERE `topics`.`post_type` = '{$tpt}'
    10911091                    AND `topics`.`post_status` IN ( '{$pps}', '{$cps}' )
    1092                 GROUP BY `topics`.`ID`);";
     1092                GROUP BY `topics`.`ID`)";
    10931093
    10941094    if ( is_wp_error( $bbp_db->query( $sql ) ) ) {
    … …  
    11191119    $result    = __( 'Failed!', 'bbpress' );
    11201120
    1121     $sql_delete = "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_voice_count';";
     1121    $sql_delete = "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_voice_count'";
    11221122    if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
    11231123        return array( 1, sprintf( $statement, $result ) );
    … …  
    11391139                    AND `posts`.`post_status` IN ( '{$pps}', '{$cps}' )
    11401140                    AND `posts`.`post_author` != '0'
    1141                 GROUP BY `postmeta`.`meta_value`);";
     1141                GROUP BY `postmeta`.`meta_value`)";
    11421142
    11431143    if ( is_wp_error( $bbp_db->query( $sql ) ) ) {
    … …  
    11681168    $result    = __( 'Failed!', 'bbpress' );
    11691169
    1170     $sql_delete = "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_reply_count_hidden';";
     1170    $sql_delete = "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_reply_count_hidden'";
    11711171    if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
    11721172        return array( 1, sprintf( $statement, $result ) );
    … …  
    11791179    $pps = bbp_get_pending_status_id();
    11801180
    1181     $sql = "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`) (SELECT `post_parent`, '_bbp_reply_count_hidden', COUNT(`post_status`) as `meta_value` FROM `{$bbp_db->posts}` WHERE `post_type` = '{$rpt}' AND `post_status` IN ( '{$tps}', '{$sps}', '{$pps}' ) GROUP BY `post_parent`);";
     1181    $sql = "INSERT INTO `{$bbp_db->postmeta}` (`post_id`, `meta_key`, `meta_value`) (SELECT `post_parent`, '_bbp_reply_count_hidden', COUNT(`post_status`) as `meta_value` FROM `{$bbp_db->posts}` WHERE `post_type` = '{$rpt}' AND `post_status` IN ( '{$tps}', '{$sps}', '{$pps}' ) GROUP BY `post_parent`)";
    11821182    if ( is_wp_error( $bbp_db->query( $sql ) ) ) {
    11831183        return array( 2, sprintf( $statement, $result ) );
    … …  
    12161216                                        AND `forummeta`.`meta_key` = '_bbp_old_forum_id'
    12171217                                WHERE `forum`.`post_type` = '" . bbp_get_forum_post_type() . "'
    1218                                 GROUP BY `forum`.`ID`;" );
     1218                                GROUP BY `forum`.`ID`" );
    12191219
    12201220    // Bail if forum IDs returned an error
    … …  
    12351235
    12361236        // Attempt to update group meta
    1237         $updated = $bbp_db->query( "UPDATE `{$groups_meta_table}` SET `meta_value` = '{$group_forums->ID}' WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->meta_value}';" );
     1237        $updated = $bbp_db->query( "UPDATE `{$groups_meta_table}` SET `meta_value` = '{$group_forums->ID}' WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->meta_value}'" );
    12381238
    12391239        // Bump the count
    … …  
    12431243
    12441244        // Update group to forum relationship data
    1245         $group_id = (int) $bbp_db->get_var( "SELECT `group_id` FROM `{$groups_meta_table}` WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->ID}';" );
     1245        $group_id = (int) $bbp_db->get_var( "SELECT `group_id` FROM `{$groups_meta_table}` WHERE `meta_key` = 'forum_id' AND `meta_value` = '{$group_forums->ID}'" );
    12461246        if ( ! empty( $group_id ) ) {
    12471247
    … …  
    12501250
    12511251            // Get the group status
    1252             $group_status = $bbp_db->get_var( "SELECT `status` FROM `{$groups_table}` WHERE `id` = '{$group_id}';" );
     1252            $group_status = $bbp_db->get_var( "SELECT `status` FROM `{$groups_table}` WHERE `id` = '{$group_id}'" );
    12531253
    12541254            // Sync up forum visibility based on group status
    … …  
    13431343    $result    = __( 'Failed!', 'bbpress' );
    13441344
    1345     $sql_delete = "DELETE FROM {$bbp_db->postmeta} WHERE meta_key IN ( '_bbp_topic_count', '_bbp_total_topic_count', '_bbp_topic_count_hidden' );";
     1345    $sql_delete = "DELETE FROM {$bbp_db->postmeta} WHERE meta_key IN ( '_bbp_topic_count', '_bbp_total_topic_count', '_bbp_topic_count_hidden' )";
    13461346    if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
    13471347        return array( 1, sprintf( $statement, $result ) );
    … …  
    14251425    $result      = __( 'Failed!', 'bbpress' );
    14261426
    1427     $sql_select  = "SELECT `post_author`, COUNT(DISTINCT `ID`) as `_count` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "' GROUP BY `post_author`;";
     1427    $sql_select  = "SELECT `post_author`, COUNT(DISTINCT `ID`) as `_count` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "' GROUP BY `post_author`";
    14281428    $insert_rows = $bbp_db->get_results( $sql_select );
    14291429
    … …  
    14421442    }
    14431443
    1444     $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
     1444    $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}'";
    14451445    if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
    14461446        return array( 3, sprintf( $statement, $result ) );
    … …  
    14491449    foreach ( array_chunk( $insert_values, 10000 ) as $chunk ) {
    14501450        $chunk = "\n" . implode( ",\n", $chunk );
    1451         $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
     1451        $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk}";
    14521452
    14531453        if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
    … …  
    14771477    $result      = __( 'Failed!', 'bbpress' );
    14781478
    1479     $sql_select  = "SELECT `post_author`, COUNT(DISTINCT `ID`) as `_count` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_reply_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "' GROUP BY `post_author`;";
     1479    $sql_select  = "SELECT `post_author`, COUNT(DISTINCT `ID`) as `_count` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_reply_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "' GROUP BY `post_author`";
    14801480    $insert_rows = $bbp_db->get_results( $sql_select );
    14811481
    … …  
    14941494    }
    14951495
    1496     $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
     1496    $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}'";
    14971497    if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
    14981498        return array( 3, sprintf( $statement, $result ) );
    … …  
    15011501    foreach ( array_chunk( $insert_values, 10000 ) as $chunk ) {
    15021502        $chunk = "\n" . implode( ",\n", $chunk );
    1503         $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
     1503        $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk}";
    15041504
    15051505        if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
    … …  
    15301530
    15311531    $key       = $bbp_db->prefix . '_bbp_favorites';
    1532     $users     = $bbp_db->get_results( "SELECT `user_id`, `meta_value` AS `favorites` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';" );
     1532    $users     = $bbp_db->get_results( "SELECT `user_id`, `meta_value` AS `favorites` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}'" );
    15331533
    15341534    if ( is_wp_error( $users ) ) {
    … …  
    15361536    }
    15371537
    1538     $topics = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "';" );
     1538    $topics = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "'" );
    15391539
    15401540    if ( is_wp_error( $topics ) ) {
    … …  
    15651565    }
    15661566
    1567     $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
     1567    $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}'";
    15681568    if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
    15691569        return array( 4, sprintf( $statement, $result ) );
    … …  
    15721572    foreach ( array_chunk( $values, 10000 ) as $chunk ) {
    15731573        $chunk = "\n" . implode( ",\n", $chunk );
    1574         $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
     1574        $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk}";
    15751575        if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
    15761576            return array( 5, sprintf( $statement, $result ) );
    … …  
    16001600
    16011601    $key       = $bbp_db->prefix . '_bbp_subscriptions';
    1602     $users     = $bbp_db->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';" );
     1602    $users     = $bbp_db->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}'" );
    16031603
    16041604    if ( is_wp_error( $users ) ) {
    … …  
    16061606    }
    16071607
    1608     $topics = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "';" );
     1608    $topics = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "'" );
    16091609    if ( is_wp_error( $topics ) ) {
    16101610        return array( 2, sprintf( $statement, $result ) );
    … …  
    16341634    }
    16351635
    1636     $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
     1636    $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}'";
    16371637    if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
    16381638        return array( 4, sprintf( $statement, $result ) );
    … …  
    16411641    foreach ( array_chunk( $values, 10000 ) as $chunk ) {
    16421642        $chunk = "\n" . implode( ",\n", $chunk );
    1643         $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
     1643        $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk}";
    16441644        if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
    16451645            return array( 5, sprintf( $statement, $result ) );
    … …  
    16691669
    16701670    $key       = $bbp_db->prefix . '_bbp_forum_subscriptions';
    1671     $users     = $bbp_db->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';" );
     1671    $users     = $bbp_db->get_results( "SELECT `user_id`, `meta_value` AS `subscriptions` FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}'" );
    16721672
    16731673    if ( is_wp_error( $users ) ) {
    … …  
    16751675    }
    16761676
    1677     $forums = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_forum_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "';" );
     1677    $forums = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_forum_post_type() . "' AND `post_status` = '" . bbp_get_public_status_id() . "'" );
    16781678    if ( is_wp_error( $forums ) ) {
    16791679        return array( 2, sprintf( $statement, $result ) );
    … …  
    17031703    }
    17041704
    1705     $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}';";
     1705    $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` = '{$key}'";
    17061706    if ( is_wp_error( $bbp_db->query( $sql_delete ) ) ) {
    17071707        return array( 4, sprintf( $statement, $result ) );
    … …  
    17101710    foreach ( array_chunk( $values, 10000 ) as $chunk ) {
    17111711        $chunk = "\n" . implode( ",\n", $chunk );
    1712         $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk};";
     1712        $sql_insert = "INSERT INTO `{$bbp_db->usermeta}` (`user_id`, `meta_key`, `meta_value`) VALUES {$chunk}";
    17131713        if ( is_wp_error( $bbp_db->query( $sql_insert ) ) ) {
    17141714            return array( 5, sprintf( $statement, $result ) );
    … …  
    18011801
    18021802    // First, delete everything.
    1803     if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` IN ( '_bbp_last_reply_id', '_bbp_last_topic_id', '_bbp_last_active_id', '_bbp_last_active_time' );" ) ) ) {
     1803    if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` IN ( '_bbp_last_reply_id', '_bbp_last_topic_id', '_bbp_last_active_id', '_bbp_last_active_time' )" ) ) ) {
    18041804        return array( 1, sprintf( $statement, $result ) );
    18051805    }
    … …  
    18161816            FROM `{$bbp_db->posts}` AS `topic` INNER JOIN `{$bbp_db->posts}` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
    18171817            WHERE `reply`.`post_status` = '{$pps}' AND `topic`.`post_type` = '{$tpt}' AND `reply`.`post_type` = '{$rpt}'
    1818             GROUP BY `topic`.`ID` );" ) ) ) {
     1818            GROUP BY `topic`.`ID` )" ) ) ) {
    18191819        return array( 2, sprintf( $statement, $result ) );
    18201820    }
    … …  
    18251825            FROM `{$bbp_db->posts}` AS `topic` LEFT JOIN `{$bbp_db->postmeta}` AS `reply`
    18261826            ON `topic`.`ID` = `reply`.`post_id` AND `reply`.`meta_key` = '_bbp_last_reply_id'
    1827             WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = '{$tpt}' );" ) ) ) {
     1827            WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = '{$tpt}' )" ) ) ) {
    18281828        return array( 3, sprintf( $statement, $result ) );
    18291829    }
    … …  
    18341834            FROM `{$bbp_db->posts}` AS `forum` INNER JOIN `{$bbp_db->posts}` AS `topic` ON `forum`.`ID` = `topic`.`post_parent`
    18351835            WHERE `topic`.`post_status` = '{$pps}' AND `forum`.`post_type` = '{$fpt}' AND `topic`.`post_type` = '{$tpt}'
    1836             GROUP BY `forum`.`ID` );" ) ) ) {
     1836            GROUP BY `forum`.`ID` )" ) ) ) {
    18371837        return array( 4, sprintf( $statement, $result ) );
    18381838    }
    … …  
    18431843            FROM `{$bbp_db->posts}` AS `forum` LEFT JOIN `{$bbp_db->postmeta}` AS `topic`
    18441844            ON `forum`.`ID` = `topic`.`post_id` AND `topic`.`meta_key` = '_bbp_last_topic_id'
    1845             WHERE `topic`.`meta_id` IS NULL AND `forum`.`post_type` = '{$fpt}' );" ) ) ) {
     1845            WHERE `topic`.`meta_id` IS NULL AND `forum`.`post_type` = '{$fpt}' )" ) ) ) {
    18461846        return array( 5, sprintf( $statement, $result ) );
    18471847    }
    … …  
    18521852            FROM `{$bbp_db->posts}` AS `topic` INNER JOIN `{$bbp_db->posts}` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
    18531853            WHERE `reply`.`post_status` = '{$pps}' AND `topic`.`post_type` = '{$tpt}' AND `reply`.`post_type` = '{$rpt}'
    1854             GROUP BY `topic`.`ID` );" ) ) ) {
     1854            GROUP BY `topic`.`ID` )" ) ) ) {
    18551855        return array( 6, sprintf( $statement, $result ) );
    18561856    }
    … …  
    18611861            FROM `{$bbp_db->posts}` AS `topic` LEFT JOIN `{$bbp_db->postmeta}` AS `reply`
    18621862            ON `topic`.`ID` = `reply`.`post_id` AND `reply`.`meta_key` = '_bbp_last_active_id'
    1863             WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = '{$tpt}' );" ) ) ) {
     1863            WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = '{$tpt}' )" ) ) ) {
    18641864        return array( 7, sprintf( $statement, $result ) );
    18651865    }
    … …  
    18701870            FROM `{$bbp_db->posts}` AS `topic` INNER JOIN `{$bbp_db->posts}` AS `reply` ON `topic`.`ID` = `reply`.`post_parent`
    18711871            WHERE `reply`.`post_status` = '{$pps}' AND `topic`.`post_type` = '{$tpt}' AND `reply`.`post_type` = '{$rpt}'
    1872             GROUP BY `topic`.`ID` );" ) ) ) {
     1872            GROUP BY `topic`.`ID` )" ) ) ) {
    18731873        return array( 8, sprintf( $statement, $result ) );
    18741874    }
    … …  
    18791879            FROM `{$bbp_db->posts}` AS `topic` LEFT JOIN `{$bbp_db->postmeta}` AS `reply`
    18801880            ON `topic`.`ID` = `reply`.`post_id` AND `reply`.`meta_key` = '_bbp_last_active_time'
    1881             WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = '{$tpt}' );" ) ) ) {
     1881            WHERE `reply`.`meta_id` IS NULL AND `topic`.`post_type` = '{$tpt}' )" ) ) ) {
    18821882        return array( 9, sprintf( $statement, $result ) );
    18831883    }
    18841884
    18851885    // Forums need to know what their last active item is as well. Now it gets a bit more complex to do in the database.
    1886     $forums = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '{$fpt}' and `post_status` != 'auto-draft';" );
     1886    $forums = $bbp_db->get_col( "SELECT `ID` FROM `{$bbp_db->posts}` WHERE `post_type` = '{$fpt}' and `post_status` != 'auto-draft'" );
    18871887    if ( is_wp_error( $forums ) ) {
    18881888        return array( 10, sprintf( $statement, $result ) );
    … …  
    19281928    $result    = __( 'Failed!', 'bbpress' );
    19291929
    1930     $forums    = $bbp_db->get_col( "SELECT ID FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_forum_post_type() . "';" );
     1930    $forums    = $bbp_db->get_col( "SELECT ID FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_forum_post_type() . "'" );
    19311931
    19321932    // Bail if no forums found
    … …  
    19971997    $changed       = 0;
    19981998
    1999     $closed_topics = $bbp_db->get_col( "SELECT ID FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = 'closed';" );
     1999    $closed_topics = $bbp_db->get_col( "SELECT ID FROM `{$bbp_db->posts}` WHERE `post_type` = '" . bbp_get_topic_post_type() . "' AND `post_status` = 'closed'" );
    20002000
    20012001    // Bail if no closed topics found
    … …  
    20662066
    20672067    // First, delete everything.
    2068     if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_forum_id';" ) ) ) {
     2068    if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_forum_id'" ) ) ) {
    20692069        return array( 1, sprintf( $statement, $result ) );
    20702070    }
    … …  
    20802080                AS `topic`
    20812081            WHERE `topic`.`post_type` = '{$tpt}'
    2082             GROUP BY `topic`.`ID` );" ) ) ) {
     2082            GROUP BY `topic`.`ID` )" ) ) ) {
    20832083        return array( 2, sprintf( $statement, $result ) );
    20842084    }
    … …  
    20942094            WHERE `topic`.`post_type` = '{$tpt}'
    20952095                AND `reply`.`post_type` = '{$rpt}'
    2096             GROUP BY `reply`.`ID` );" ) ) ) {
     2096            GROUP BY `reply`.`ID` )" ) ) ) {
    20972097        return array( 3, sprintf( $statement, $result ) );
    20982098    }
    … …  
    21212121
    21222122    // First, delete everything.
    2123     if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_topic_id';" ) ) ) {
     2123    if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_topic_id'" ) ) ) {
    21242124        return array( 1, sprintf( $statement, $result ) );
    21252125    }
    … …  
    21352135                AS `topic`
    21362136            WHERE `topic`.`post_type` = '{$tpt}'
    2137             GROUP BY `topic`.`ID` );" ) ) ) {
     2137            GROUP BY `topic`.`ID` )" ) ) ) {
    21382138        return array( 3, sprintf( $statement, $result ) );
    21392139    }
    … …  
    21492149            WHERE `topic`.`post_type` = '{$tpt}'
    21502150                AND `reply`.`post_type` = '{$rpt}'
    2151             GROUP BY `reply`.`ID` );" ) ) ) {
     2151            GROUP BY `reply`.`ID` )" ) ) ) {
    21522152        return array( 4, sprintf( $statement, $result ) );
    21532153    }
    … …  
    21762176
    21772177    // Delete cases where `_bbp_reply_to` was accidentally set to itself
    2178     if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_reply_to' AND `post_id` = `meta_value`;" ) ) ) {
     2178    if ( is_wp_error( $bbp_db->query( "DELETE FROM `{$bbp_db->postmeta}` WHERE `meta_key` = '_bbp_reply_to' AND `post_id` = `meta_value`" ) ) ) {
    21792179        return array( 1, sprintf( $statement, $result ) );
    21802180    }
    … …  
    21932193                                        ON `a`.`menu_order` = `b`.`menu_order`
    21942194                                        AND `a`.`post_parent` = `b`.`post_parent`
    2195                                         WHERE `post_type` = '{$rpt}';", OBJECT_K );
     2195                                        WHERE `post_type` = '{$rpt}'", OBJECT_K );
    21962196
    21972197    // Bail if no replies returned
    … …  
    22292229    $changed   = $total = 0;
    22302230    $key       = $bbp_db->prefix . '_bbp_favorites';
    2231     $favorites = $bbp_db->get_results( "SELECT * FROM {$bbp_db->usermeta} WHERE meta_key = '{$key}'" );
     2231    $favorites = $bbp_db->get_results( $bbp_db->prepare( "SELECT * FROM {$bbp_db->usermeta} WHERE meta_key = %s", $key ) );
    22322232
    22332233    // Bail if no closed topics found
    … …  
    22922292    $changed       = $total = 0;
    22932293    $key           = $bbp_db->prefix . '_bbp_subscriptions';
    2294     $subscriptions = $bbp_db->get_results( "SELECT * FROM {$bbp_db->usermeta} WHERE meta_key = '{$key}'" );
     2294    $subscriptions = $bbp_db->get_results( $bbp_db->prepare( "SELECT * FROM {$bbp_db->usermeta} WHERE meta_key = %s", $key ) );
    22952295
    22962296    // Bail if no closed topics found
    … …  
    24682468        $statement  = __( 'Deleting Post Meta… %s', 'bbpress' );
    24692469        $sql_meta   = implode( "', '", $sql_meta );
    2470         $sql_delete = "DELETE FROM `{$bbp_db->postmeta}` WHERE `post_id` IN ('{$sql_meta}');";
     2470        $sql_delete = "DELETE FROM `{$bbp_db->postmeta}` WHERE `post_id` IN ('{$sql_meta}')";
    24712471        $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
    24722472        $messages[] = sprintf( $statement, $result );
    … …  
    24822482        $statement  = __( 'Deleting Post Revisions… %s', 'bbpress' );
    24832483        $sql_meta   = implode( "', '", $sql_meta );
    2484         $sql_delete = "DELETE FROM `{$bbp_db->posts}` WHERE `post_parent` IN ('{$sql_meta}') AND `post_type` = 'revision';";
     2484        $sql_delete = "DELETE FROM `{$bbp_db->posts}` WHERE `post_parent` IN ('{$sql_meta}') AND `post_type` = 'revision'";
    24852485        $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
    24862486        $messages[] = sprintf( $statement, $result );
    … …  
    24902490
    24912491    $statement  = __( 'Deleting Forum Moderators… %s', 'bbpress' );
    2492     $sql_delete = "DELETE a,b,c FROM `{$bbp_db->terms}` AS a LEFT JOIN `{$bbp_db->term_taxonomy}` AS c ON a.term_id = c.term_id LEFT JOIN `{$bbp_db->term_relationships}` AS b ON b.term_taxonomy_id = c.term_taxonomy_id WHERE c.taxonomy = 'forum-mod';";
     2492    $sql_delete = "DELETE a,b,c FROM `{$bbp_db->terms}` AS a LEFT JOIN `{$bbp_db->term_taxonomy}` AS c ON a.term_id = c.term_id LEFT JOIN `{$bbp_db->term_relationships}` AS b ON b.term_taxonomy_id = c.term_taxonomy_id WHERE c.taxonomy = 'forum-mod'";
    24932493    $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
    24942494    $messages[] = sprintf( $statement, $result );
    … …  
    24972497
    24982498    $statement  = __( 'Deleting Topic Tags… %s', 'bbpress' );
    2499     $sql_delete = "DELETE a,b,c FROM `{$bbp_db->terms}` AS a LEFT JOIN `{$bbp_db->term_taxonomy}` AS c ON a.term_id = c.term_id LEFT JOIN `{$bbp_db->term_relationships}` AS b ON b.term_taxonomy_id = c.term_taxonomy_id WHERE c.taxonomy = 'topic-tag';";
     2499    $sql_delete = "DELETE a,b,c FROM `{$bbp_db->terms}` AS a LEFT JOIN `{$bbp_db->term_taxonomy}` AS c ON a.term_id = c.term_id LEFT JOIN `{$bbp_db->term_relationships}` AS b ON b.term_taxonomy_id = c.term_taxonomy_id WHERE c.taxonomy = 'topic-tag'";
    25002500    $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
    25012501    $messages[] = sprintf( $statement, $result );
    … …  
    25132513            $statement  = __( 'Deleting Imported Users… %s', 'bbpress' );
    25142514            $sql_meta   = implode( "', '", $sql_meta );
    2515             $sql_delete = "DELETE FROM `{$bbp_db->users}` WHERE `ID` IN ('{$sql_meta}');";
     2515            $sql_delete = "DELETE FROM `{$bbp_db->users}` WHERE `ID` IN ('{$sql_meta}')";
    25162516            $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
    25172517            $messages[] = sprintf( $statement, $result );
    25182518            $statement  = __( 'Deleting Imported User Meta… %s', 'bbpress' );
    2519             $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `user_id` IN ('{$sql_meta}');";
     2519            $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `user_id` IN ('{$sql_meta}')";
    25202520            $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
    25212521            $messages[] = sprintf( $statement, $result );
    … …  
    25252525    // Next, if we still have users that were not imported delete that meta data
    25262526    $statement  = __( 'Deleting User Meta… %s', 'bbpress' );
    2527     $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` LIKE '%%_bbp_%%';";
     2527    $sql_delete = "DELETE FROM `{$bbp_db->usermeta}` WHERE `meta_key` LIKE '%%_bbp_%%'";
    25282528    $result     = is_wp_error( $bbp_db->query( $sql_delete ) ) ? $failed : $success;
    25292529    $messages[] = sprintf( $statement, $result );
Note: See TracChangeset for help on using the changeset viewer.