| @@ -34,9 +34,9 @@ | ||
| 34 | 34 | if ( ! $old_db_version ) { |
| 35 | 35 | $old_db_version = get_option( $this->db_opt_name ); |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - if ( $this->db_version == $old_db_version ) { | |
| 38 | + if ( $this->db_version === (int) $old_db_version ) { | |
| 39 | 39 | return; |
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | global $wpdb; |
| @@ -135,9 +135,9 @@ | ||
| 135 | 135 | * @param int|string $id |
| 136 | 136 | * |
| 137 | 137 | * @return bool|int |
| 138 | 138 | */ |
| 139 | - public function &destroy( $id ) { | |
| 139 | + public function destroy( $id ) { | |
| 140 | 140 | FrmAppHelper::permission_check( 'administrator' ); |
| 141 | 141 | |
| 142 | 142 | global $wpdb; |
| 143 | 143 | $id = absint( $id ); |
| @@ -147,17 +147,10 @@ | ||
| 147 | 147 | */ |
| 148 | 148 | do_action( 'frm_before_destroy_' . $this->singular, $id ); |
| 149 | 149 | |
| 150 | 150 | // @codingStandardsIgnoreStart |
| 151 | - $result = $wpdb->query( | |
| 152 | - $wpdb->prepare( | |
| 153 | - 'DELETE FROM ' . $wpdb->prefix . $this->table_name . ' WHERE id=%d', | |
| 154 | - $id | |
| 155 | - ) | |
| 156 | - ); | |
| 151 | + return $wpdb->query( $wpdb->prepare( 'DELETE FROM ' . $wpdb->prefix . $this->table_name . ' WHERE id=%d', $id ) ); | |
| 157 | 152 | // @codingStandardsIgnoreEnd |
| 158 | - | |
| 159 | - return $result; | |
| 160 | 153 | } |
| 161 | 154 | |
| 162 | 155 | /** |
| 163 | 156 | * @param int|string $id |
| @@ -165,8 +158,9 @@ | ||
| 165 | 158 | * @return array|object|null |
| 166 | 159 | */ |
| 167 | 160 | public function get_one( $id ) { |
| 168 | 161 | global $wpdb; |
| 162 | + | |
| 169 | 163 | // @codingStandardsIgnoreStart |
| 170 | 164 | return $wpdb->get_row( |
| 171 | 165 | $wpdb->prepare( |
| 172 | 166 | 'SELECT * FROM ' . $wpdb->prefix . $this->table_name . ' WHERE id=%d', |
| @@ -291,11 +285,9 @@ | ||
| 291 | 285 | * |
| 292 | 286 | * @return void |
| 293 | 287 | */ |
| 294 | 288 | private function fill_values( $values, &$new_values ) { |
| 295 | - $defaults = $this->get_defaults(); | |
| 296 | - | |
| 297 | - foreach ( $defaults as $val => $default ) { | |
| 289 | + foreach ( $this->get_defaults() as $val => $default ) { | |
| 298 | 290 | if ( isset( $values[ $val ] ) ) { |
| 299 | 291 | if ( $default['sanitize'] === 'float' ) { |
| 300 | 292 | $new_values[ $val ] = (float) $values[ $val ]; |
| 301 | 293 | } elseif ( ! empty( $default['sanitize'] ) ) { |
| @@ -317,12 +309,14 @@ | ||
| 317 | 309 | private function migrate_data( $old_db_version ) { |
| 318 | 310 | $migrations = array( 4 ); |
| 319 | 311 | |
| 320 | 312 | foreach ( $migrations as $migration ) { |
| 321 | - if ( $this->db_version >= $migration && $old_db_version < $migration ) { | |
| 322 | - $function_name = 'migrate_to_' . $migration; | |
| 323 | - $this->$function_name(); | |
| 313 | + if ( $this->db_version < $migration || $old_db_version >= $migration ) { | |
| 314 | + continue; | |
| 324 | 315 | } |
| 316 | + | |
| 317 | + $function_name = 'migrate_to_' . $migration; | |
| 318 | + $this->$function_name(); | |
| 325 | 319 | } |
| 326 | 320 | } |
| 327 | 321 | |
| 328 | 322 | /** |
| @@ -333,9 +327,9 @@ | ||
| 333 | 327 | private function migrate_to_4() { |
| 334 | 328 | global $wpdb; |
| 335 | 329 | $result = $wpdb->get_results( $wpdb->prepare( 'SHOW COLUMNS FROM ' . $wpdb->prefix . 'frm_payments LIKE %s', 'completed' ) ); |
| 336 | 330 | |
| 337 | - if ( empty( $result ) ) { | |
| 331 | + if ( ! $result ) { | |
| 338 | 332 | return; |
| 339 | 333 | } |
| 340 | 334 | |
| 341 | 335 | $payments = $wpdb->get_results( |
