eventespresso / event-espresso-core

core/domain/services/admin/registrations/list_table/csv_reports/AnswersCSV.php

Indentation +62 added lines, -62 removed lines

@@ -18,66 +18,66 @@
 class AnswersCSV
 {
 
-    /**
-     * Add question / answer columns to the CSV row
-     *
-     * @param array $reg_row
-     * @param array $data
-     * @param array $question_labels
-     * @return mixed
-     * @throws EE_Error
-     */
-    public static function addAnswerColumns(array $reg_row, $data, $question_labels)
-    {
-        // make sure each registration has the same questions in the same order
-        foreach ($question_labels as $question_label) {
-            if (! isset($data[ $question_label ])) {
-                $data[ $question_label ] = null;
-            }
-        }
-        $answers = EEM_Answer::instance()->get_all_wpdb_results([
-            ['REG_ID' => $reg_row['Registration.REG_ID']],
-            'force_join' => ['Question'],
-        ]);
-        // now fill out the questions THEY answered
-        foreach ($answers as $answer_row) {
-            if ($answer_row['Question.QST_system']) {
-                // it's an answer to a system question. That was already displayed as part of the attendee
-                // fields, so don't write it out again thanks.
-                continue;
-            }
-            if ($answer_row['Question.QST_ID']) {
-                $question_label = EEH_Export::prepare_value_from_db_for_display(
-                    EEM_Question::instance(),
-                    'QST_admin_label',
-                    $answer_row['Question.QST_admin_label']
-                );
-            } else {
-                $question_label = sprintf(esc_html__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
-            }
-            if (! array_key_exists($question_label, $data)) {
-                // We don't need an answer for this specific question in the current dataset
-                // so skip adding this value to $data.
-                continue;
-            }
-            if (
-                isset($answer_row['Question.QST_type'])
-                && $answer_row['Question.QST_type'] == EEM_Question::QST_type_state
-            ) {
-                $data[ $question_label ] = EEM_State::instance()->get_state_name_by_ID(
-                    $answer_row['Answer.ANS_value']
-                );
-            } else {
-                // this isn't for html, so don't show html entities
-                $data[ $question_label ] = html_entity_decode(
-                    EEH_Export::prepare_value_from_db_for_display(
-                        EEM_Answer::instance(),
-                        'ANS_value',
-                        $answer_row['Answer.ANS_value']
-                    )
-                );
-            }
-        }
-        return $data;
-    }
+	/**
+	 * Add question / answer columns to the CSV row
+	 *
+	 * @param array $reg_row
+	 * @param array $data
+	 * @param array $question_labels
+	 * @return mixed
+	 * @throws EE_Error
+	 */
+	public static function addAnswerColumns(array $reg_row, $data, $question_labels)
+	{
+		// make sure each registration has the same questions in the same order
+		foreach ($question_labels as $question_label) {
+			if (! isset($data[ $question_label ])) {
+				$data[ $question_label ] = null;
+			}
+		}
+		$answers = EEM_Answer::instance()->get_all_wpdb_results([
+			['REG_ID' => $reg_row['Registration.REG_ID']],
+			'force_join' => ['Question'],
+		]);
+		// now fill out the questions THEY answered
+		foreach ($answers as $answer_row) {
+			if ($answer_row['Question.QST_system']) {
+				// it's an answer to a system question. That was already displayed as part of the attendee
+				// fields, so don't write it out again thanks.
+				continue;
+			}
+			if ($answer_row['Question.QST_ID']) {
+				$question_label = EEH_Export::prepare_value_from_db_for_display(
+					EEM_Question::instance(),
+					'QST_admin_label',
+					$answer_row['Question.QST_admin_label']
+				);
+			} else {
+				$question_label = sprintf(esc_html__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
+			}
+			if (! array_key_exists($question_label, $data)) {
+				// We don't need an answer for this specific question in the current dataset
+				// so skip adding this value to $data.
+				continue;
+			}
+			if (
+				isset($answer_row['Question.QST_type'])
+				&& $answer_row['Question.QST_type'] == EEM_Question::QST_type_state
+			) {
+				$data[ $question_label ] = EEM_State::instance()->get_state_name_by_ID(
+					$answer_row['Answer.ANS_value']
+				);
+			} else {
+				// this isn't for html, so don't show html entities
+				$data[ $question_label ] = html_entity_decode(
+					EEH_Export::prepare_value_from_db_for_display(
+						EEM_Answer::instance(),
+						'ANS_value',
+						$answer_row['Answer.ANS_value']
+					)
+				);
+			}
+		}
+		return $data;
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -31,8 +31,8 @@ 
     {
         // make sure each registration has the same questions in the same order
         foreach ($question_labels as $question_label) {
-            if (! isset($data[ $question_label ])) {
-                $data[ $question_label ] = null;
+            if ( ! isset($data[$question_label])) {
+                $data[$question_label] = null;
             }
         }
         $answers = EEM_Answer::instance()->get_all_wpdb_results([
@@ -55,7 +55,7 @@ 
             } else {
                 $question_label = sprintf(esc_html__('Question $s', 'event_espresso'), $answer_row['Answer.QST_ID']);
             }
-            if (! array_key_exists($question_label, $data)) {
+            if ( ! array_key_exists($question_label, $data)) {
                 // We don't need an answer for this specific question in the current dataset
                 // so skip adding this value to $data.
                 continue;
@@ -64,12 +64,12 @@ 
                 isset($answer_row['Question.QST_type'])
                 && $answer_row['Question.QST_type'] == EEM_Question::QST_type_state
             ) {
-                $data[ $question_label ] = EEM_State::instance()->get_state_name_by_ID(
+                $data[$question_label] = EEM_State::instance()->get_state_name_by_ID(
                     $answer_row['Answer.ANS_value']
                 );
             } else {
                 // this isn't for html, so don't show html entities
-                $data[ $question_label ] = html_entity_decode(
+                $data[$question_label] = html_entity_decode(
                     EEH_Export::prepare_value_from_db_for_display(
                         EEM_Answer::instance(),
                         'ANS_value',

espresso.php

Indentation +80 added lines, -80 removed lines

@@ -38,103 +38,103 @@
  * @since           4.0
  */
 if (function_exists('espresso_version')) {
-    if (! function_exists('espresso_duplicate_plugin_error')) {
-        /**
-         *    espresso_duplicate_plugin_error
-         *    displays if more than one version of EE is activated at the same time
-         */
-        function espresso_duplicate_plugin_error()
-        {
-            ?>
+	if (! function_exists('espresso_duplicate_plugin_error')) {
+		/**
+		 *    espresso_duplicate_plugin_error
+		 *    displays if more than one version of EE is activated at the same time
+		 */
+		function espresso_duplicate_plugin_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    echo esc_html__(
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
-                        'event_espresso'
-                    ); ?>
+					echo esc_html__(
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
+						'event_espresso'
+					); ?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
-    }
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
+	}
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
 } else {
-    define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
-        /**
-         * espresso_minimum_php_version_error
-         *
-         * @return void
-         */
-        function espresso_minimum_php_version_error()
-        {
-            ?>
+	define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
+		/**
+		 * espresso_minimum_php_version_error
+		 *
+		 * @return void
+		 */
+		function espresso_minimum_php_version_error()
+		{
+			?>
             <div class="error">
                 <p>
                     <?php
-                    printf(
-                        esc_html__(
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
-                            'event_espresso'
-                        ),
-                        EE_MIN_PHP_VER_REQUIRED,
-                        PHP_VERSION,
-                        '<br/>',
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
-                    );
-                    ?>
+					printf(
+						esc_html__(
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
+							'event_espresso'
+						),
+						EE_MIN_PHP_VER_REQUIRED,
+						PHP_VERSION,
+						'<br/>',
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
+					);
+					?>
                 </p>
             </div>
             <?php
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
-        }
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
+		}
 
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
-    } else {
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
-        /**
-         * espresso_version
-         * Returns the plugin version
-         *
-         * @return string
-         */
-        function espresso_version()
-        {
-            return apply_filters('FHEE__espresso__espresso_version', '4.10.33.rc.009');
-        }
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
+	} else {
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
+		/**
+		 * espresso_version
+		 * Returns the plugin version
+		 *
+		 * @return string
+		 */
+		function espresso_version()
+		{
+			return apply_filters('FHEE__espresso__espresso_version', '4.10.33.rc.009');
+		}
 
-        /**
-         * espresso_plugin_activation
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
-         */
-        function espresso_plugin_activation()
-        {
-            update_option('ee_espresso_activation', true);
-        }
+		/**
+		 * espresso_plugin_activation
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
+		 */
+		function espresso_plugin_activation()
+		{
+			update_option('ee_espresso_activation', true);
+		}
 
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
 
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
-        bootstrap_espresso();
-    }
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
+		bootstrap_espresso();
+	}
 }
 if (! function_exists('espresso_deactivate_plugin')) {
-    /**
-     *    deactivate_plugin
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
-     *
-     * @access public
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
-     * @return    void
-     */
-    function espresso_deactivate_plugin($plugin_basename = '')
-    {
-        if (! function_exists('deactivate_plugins')) {
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
-        }
-        unset($_GET['activate'], $_REQUEST['activate']);
-        deactivate_plugins($plugin_basename);
-    }
+	/**
+	 *    deactivate_plugin
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
+	 *
+	 * @access public
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
+	 * @return    void
+	 */
+	function espresso_deactivate_plugin($plugin_basename = '')
+	{
+		if (! function_exists('deactivate_plugins')) {
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
+		}
+		unset($_GET['activate'], $_REQUEST['activate']);
+		deactivate_plugins($plugin_basename);
+	}
 }
\ No newline at end of file

core/data_migration_scripts/4_10_0_stages/EE_DMS_4_10_0_Event_Question_Group.dmsstage.php

Indentation +130 added lines, -130 removed lines

@@ -14,138 +14,138 @@
 
 
 
-    /**
-     * Just initializes the status of the migration
-     */
-    public function __construct()
-    {
-        global $wpdb;
-        $this->_pretty_name = esc_html__('Event-Question Group Relations', 'event_espresso');
-        $this->_old_table = $wpdb->prefix . 'esp_event_question_group';
-        $this->_extra_where_sql = "WHERE EQG_primary = 0 AND EQG_additional=0";
-        parent::__construct();
-    }
+	/**
+	 * Just initializes the status of the migration
+	 */
+	public function __construct()
+	{
+		global $wpdb;
+		$this->_pretty_name = esc_html__('Event-Question Group Relations', 'event_espresso');
+		$this->_old_table = $wpdb->prefix . 'esp_event_question_group';
+		$this->_extra_where_sql = "WHERE EQG_primary = 0 AND EQG_additional=0";
+		parent::__construct();
+	}
 
 
-    /**
-     * Removes the duplicate event_question_group rows that only had EQG_primary=0. Now we just have one row
-     * joining event-to-question-groups with two columns: EQG_primary and EQG_additional, indicating which question
-     * groups apply to which category of registrant.
-     * @param array $event_question_group an associative array where keys are column names and values are their values.
-     * @return null
-     */
-    protected function _migrate_old_row($event_question_group)
-    {
-        if (isset($event_question_group['EVT_ID'], $event_question_group['QSG_ID'])) {
-            global $wpdb;
-            // If the question group was also for primary attendees, we should just update that row.
-            // And we delete this row.
-            // Updating all the rows could be slow on massive DBs, so do the slow selection first, then a quick update
-            // in order to avoid locking the table for too long.
-            $ids_to_update = $wpdb->get_col(
-                $wpdb->prepare(
-                    'SELECT EQG_ID FROM ' . $this->_old_table . ' WHERE EQG_primary=1 AND EVT_ID=%d AND QSG_ID=%d',
-                    $event_question_group['EVT_ID'],
-                    $event_question_group['QSG_ID']
-                )
-            );
-            $success = false;
-            if ($ids_to_update) {
-                $success = $wpdb->query(
-                    'UPDATE '
-                    . $this->_old_table
-                    . ' SET EQG_additional=1 WHERE EQG_ID IN ('
-                    . implode(',', array_map('intval', $ids_to_update))
-                    . ') LIMIT ' . count($ids_to_update)
-                );
-            }
-            if ($success) {
-                // Ok it's confirmed: the question group WAS for the primary attendee group too. So
-                // now we just need to delete this row.
-                $successful_delete = $wpdb->delete(
-                    $this->_old_table,
-                    [
-                        'EQG_ID' => $event_question_group['EQG_ID']
-                    ],
-                    ['%d']
-                );
-                if (!$successful_delete) {
-                    $this->add_error(
-                        sprintf(
-                            esc_html__('Could not delete old event-question group relation row "%1$s" because "%2$s"', 'event_espresso'),
-                            wp_json_encode($event_question_group),
-                            $wpdb->last_error
-                        )
-                    );
-                }
-            } else {
-                // Oh, the question group actually was NOT for the primary attendee. So we just need to update this row
-                // Let's do the selection separately from the deletion, this way we don't lock big tables for too long.
-                $ids_to_update2 = $wpdb->get_col(
-                    $wpdb->prepare(
-                        'SELECT EQG_ID FROM '
-                        . $this->_old_table
-                        . ' WHERE EVT_ID=%d AND QSG_ID=%d',
-                        $event_question_group['EVT_ID'],
-                        $event_question_group['QSG_ID']
-                    )
-                );
-                if ($ids_to_update2) {
-                    $wpdb->query(
-                        'UPDATE '
-                        . $this->_old_table
-                        . ' SET EQG_additional=1 WHERE EQG_ID IN ('
-                        . implode(',', array_map('intval', $ids_to_update2))
-                        . ') LIMIT ' . count($ids_to_update2)
-                    );
-                }
-            }
-        }
-    }
+	/**
+	 * Removes the duplicate event_question_group rows that only had EQG_primary=0. Now we just have one row
+	 * joining event-to-question-groups with two columns: EQG_primary and EQG_additional, indicating which question
+	 * groups apply to which category of registrant.
+	 * @param array $event_question_group an associative array where keys are column names and values are their values.
+	 * @return null
+	 */
+	protected function _migrate_old_row($event_question_group)
+	{
+		if (isset($event_question_group['EVT_ID'], $event_question_group['QSG_ID'])) {
+			global $wpdb;
+			// If the question group was also for primary attendees, we should just update that row.
+			// And we delete this row.
+			// Updating all the rows could be slow on massive DBs, so do the slow selection first, then a quick update
+			// in order to avoid locking the table for too long.
+			$ids_to_update = $wpdb->get_col(
+				$wpdb->prepare(
+					'SELECT EQG_ID FROM ' . $this->_old_table . ' WHERE EQG_primary=1 AND EVT_ID=%d AND QSG_ID=%d',
+					$event_question_group['EVT_ID'],
+					$event_question_group['QSG_ID']
+				)
+			);
+			$success = false;
+			if ($ids_to_update) {
+				$success = $wpdb->query(
+					'UPDATE '
+					. $this->_old_table
+					. ' SET EQG_additional=1 WHERE EQG_ID IN ('
+					. implode(',', array_map('intval', $ids_to_update))
+					. ') LIMIT ' . count($ids_to_update)
+				);
+			}
+			if ($success) {
+				// Ok it's confirmed: the question group WAS for the primary attendee group too. So
+				// now we just need to delete this row.
+				$successful_delete = $wpdb->delete(
+					$this->_old_table,
+					[
+						'EQG_ID' => $event_question_group['EQG_ID']
+					],
+					['%d']
+				);
+				if (!$successful_delete) {
+					$this->add_error(
+						sprintf(
+							esc_html__('Could not delete old event-question group relation row "%1$s" because "%2$s"', 'event_espresso'),
+							wp_json_encode($event_question_group),
+							$wpdb->last_error
+						)
+					);
+				}
+			} else {
+				// Oh, the question group actually was NOT for the primary attendee. So we just need to update this row
+				// Let's do the selection separately from the deletion, this way we don't lock big tables for too long.
+				$ids_to_update2 = $wpdb->get_col(
+					$wpdb->prepare(
+						'SELECT EQG_ID FROM '
+						. $this->_old_table
+						. ' WHERE EVT_ID=%d AND QSG_ID=%d',
+						$event_question_group['EVT_ID'],
+						$event_question_group['QSG_ID']
+					)
+				);
+				if ($ids_to_update2) {
+					$wpdb->query(
+						'UPDATE '
+						. $this->_old_table
+						. ' SET EQG_additional=1 WHERE EQG_ID IN ('
+						. implode(',', array_map('intval', $ids_to_update2))
+						. ') LIMIT ' . count($ids_to_update2)
+					);
+				}
+			}
+		}
+	}
 
-    /**
-     * Gets the rows for the existing table that shouldn't exist in 4.10.
-     * Specifically the rows where EQG_primary=false and EQG_additional=false.
-     * Gotcha: because the migration is REMOVING rows as it goes, we shouldn't use the offset.
-     *
-     * @global wpdb $wpdb
-     * @param int   $limit
-     * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
-     */
-    protected function _get_rows($limit)
-    {
-        global $wpdb;
-        $query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare(
-            "LIMIT %d",
-            $limit
-        );
-        return $wpdb->get_results($query, ARRAY_A);
-    }
+	/**
+	 * Gets the rows for the existing table that shouldn't exist in 4.10.
+	 * Specifically the rows where EQG_primary=false and EQG_additional=false.
+	 * Gotcha: because the migration is REMOVING rows as it goes, we shouldn't use the offset.
+	 *
+	 * @global wpdb $wpdb
+	 * @param int   $limit
+	 * @return array of arrays like $wpdb->get_results($sql, ARRAY_A)
+	 */
+	protected function _get_rows($limit)
+	{
+		global $wpdb;
+		$query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare(
+			"LIMIT %d",
+			$limit
+		);
+		return $wpdb->get_results($query, ARRAY_A);
+	}
 
-    /**
-     * Slight departure from the normal procedure here: because this removes rows from the DB, we need to ensure
-     * we count the records first, then do the migration.
-     *
-     * @param int $num_items
-     * @return int number of items ACTUALLY migrated
-     */
-    public function _migration_step($num_items = 50)
-    {
-        // Count the items right away. This migration step will be removing those rows, so we need to count them
-        // right away to get an accurate count.
-        $this->count_records_to_migrate();
-        $rows = $this->_get_rows($num_items);
-        $items_actually_migrated = 0;
-        foreach ($rows as $old_row) {
-            $this->_migrate_old_row($old_row);
-            $items_actually_migrated++;
-        }
-        if (
-            empty($rows)
-            || ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate())
-        ) {
-            $this->set_completed();
-        }
-        return $items_actually_migrated;
-    }
+	/**
+	 * Slight departure from the normal procedure here: because this removes rows from the DB, we need to ensure
+	 * we count the records first, then do the migration.
+	 *
+	 * @param int $num_items
+	 * @return int number of items ACTUALLY migrated
+	 */
+	public function _migration_step($num_items = 50)
+	{
+		// Count the items right away. This migration step will be removing those rows, so we need to count them
+		// right away to get an accurate count.
+		$this->count_records_to_migrate();
+		$rows = $this->_get_rows($num_items);
+		$items_actually_migrated = 0;
+		foreach ($rows as $old_row) {
+			$this->_migrate_old_row($old_row);
+			$items_actually_migrated++;
+		}
+		if (
+			empty($rows)
+			|| ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate())
+		) {
+			$this->set_completed();
+		}
+		return $items_actually_migrated;
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -21,7 +21,7 @@ 
     {
         global $wpdb;
         $this->_pretty_name = esc_html__('Event-Question Group Relations', 'event_espresso');
-        $this->_old_table = $wpdb->prefix . 'esp_event_question_group';
+        $this->_old_table = $wpdb->prefix.'esp_event_question_group';
         $this->_extra_where_sql = "WHERE EQG_primary = 0 AND EQG_additional=0";
         parent::__construct();
     }
@@ -44,7 +44,7 @@ 
             // in order to avoid locking the table for too long.
             $ids_to_update = $wpdb->get_col(
                 $wpdb->prepare(
-                    'SELECT EQG_ID FROM ' . $this->_old_table . ' WHERE EQG_primary=1 AND EVT_ID=%d AND QSG_ID=%d',
+                    'SELECT EQG_ID FROM '.$this->_old_table.' WHERE EQG_primary=1 AND EVT_ID=%d AND QSG_ID=%d',
                     $event_question_group['EVT_ID'],
                     $event_question_group['QSG_ID']
                 )
@@ -56,7 +56,7 @@ 
                     . $this->_old_table
                     . ' SET EQG_additional=1 WHERE EQG_ID IN ('
                     . implode(',', array_map('intval', $ids_to_update))
-                    . ') LIMIT ' . count($ids_to_update)
+                    . ') LIMIT '.count($ids_to_update)
                 );
             }
             if ($success) {
@@ -69,7 +69,7 @@ 
                     ],
                     ['%d']
                 );
-                if (!$successful_delete) {
+                if ( ! $successful_delete) {
                     $this->add_error(
                         sprintf(
                             esc_html__('Could not delete old event-question group relation row "%1$s" because "%2$s"', 'event_espresso'),
@@ -96,7 +96,7 @@ 
                         . $this->_old_table
                         . ' SET EQG_additional=1 WHERE EQG_ID IN ('
                         . implode(',', array_map('intval', $ids_to_update2))
-                        . ') LIMIT ' . count($ids_to_update2)
+                        . ') LIMIT '.count($ids_to_update2)
                     );
                 }
             }
@@ -115,7 +115,7 @@ 
     protected function _get_rows($limit)
     {
         global $wpdb;
-        $query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} " . $wpdb->prepare(
+        $query = "SELECT * FROM {$this->_old_table} {$this->_extra_where_sql} ".$wpdb->prepare(
             "LIMIT %d",
             $limit
         );