← All changes
|
inc/rest-api/v1/admin/class-lp-admin-rest-database-controller.php
+8
-4
4.1.7.1
→
4.4.9
View file →
| @@ -1,6 +1,8 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | +use LearnPress\Databases\DataBase; | |
| 4 | + | |
| 3 | 5 | /** |
| 4 | 6 | * Class LP_REST_Users_Controller |
| 5 | 7 | * |
| 6 | 8 | * @since 3.3.0 |
| @@ -87,14 +89,15 @@ | ||
| 87 | 89 | * |
| 88 | 90 | * @param WP_REST_Request $request . |
| 89 | 91 | * |
| 90 | 92 | * @return void |
| 93 | + * @throws Exception | |
| 91 | 94 | */ |
| 92 | 95 | public function agree_terms_upgrade( WP_REST_Request $request ) { |
| 93 | 96 | $result = new LP_REST_Response(); |
| 94 | 97 | |
| 95 | 98 | if ( $request->get_param( 'agree_terms' ) ) { |
| 96 | - LP_Settings::update_option( 'agree_terms', 1 ); | |
| 99 | + LP_Settings::update_option( 'agree_terms', LP_Updater::instance()->check_lp_db_need_upgrade() ); | |
| 97 | 100 | $result->status = 'success'; |
| 98 | 101 | } |
| 99 | 102 | |
| 100 | 103 | wp_send_json( $result ); |
| @@ -127,12 +130,13 @@ | ||
| 127 | 130 | } |
| 128 | 131 | |
| 129 | 132 | /** |
| 130 | 133 | * Get Steps upgrade completed. |
| 134 | + * @throws Exception | |
| 131 | 135 | */ |
| 132 | 136 | public function get_steps() { |
| 133 | 137 | $lp_updater = LP_Updater::instance(); |
| 134 | - $lp_db = LP_Database::getInstance(); | |
| 138 | + $lp_db = DataBase::getInstance(); | |
| 135 | 139 | $steps_completed = array(); |
| 136 | 140 | $steps_default = array(); |
| 137 | 141 | |
| 138 | 142 | $class_handle = $lp_updater->load_file_version_upgrade_db(); |
| @@ -161,9 +165,9 @@ | ||
| 161 | 165 | * can_re_upgrade | 1: can, 0: can't |
| 162 | 166 | */ |
| 163 | 167 | public function check_DB_valid_to_re_upgrade() { |
| 164 | 168 | $response = new LP_REST_Response(); |
| 165 | - $lp_db = LP_Database::getInstance(); | |
| 169 | + $lp_db = DataBase::getInstance(); | |
| 166 | 170 | $response->data->can_re_upgrade = 0; |
| 167 | 171 | |
| 168 | 172 | $col_start_time_gmt_exist = $lp_db->check_col_table( $lp_db->tb_lp_user_items, 'start_time_gmt' ); |
| 169 | 173 | $col_graduation_exist = $lp_db->check_col_table( $lp_db->tb_lp_user_items, 'graduation' ); |
| @@ -184,9 +188,9 @@ | ||
| 184 | 188 | * can_re_upgrade | 1: can, 0: can't |
| 185 | 189 | */ |
| 186 | 190 | public function delete_tb_lp_upgrade_db() { |
| 187 | 191 | $response = new LP_REST_Response(); |
| 188 | - $lp_db = LP_Database::getInstance(); | |
| 192 | + $lp_db = DataBase::getInstance(); | |
| 189 | 193 | $response->data->can_re_upgrade = 0; |
| 190 | 194 | $tables = array( |
| 191 | 195 | $lp_db->tb_lp_user_items, |
| 192 | 196 | $lp_db->tb_lp_user_itemmeta, |