Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
commit 22358340f006ca72e8c331261c31bf30680af1e0 2 parents 7034ec7 + fbf858a
Fx Bénard authored

Showing 1 changed file with 4 additions and 9 deletions. Show diff stats Hide diff stats

  1. +4 9 developer.php
13 developer.php
@@ -169,7 +169,6 @@ public function admin_init() {
169 169
170 170 register_setting( self::OPTION, self::OPTION, array( $this, 'settings_validate' ) );
171 171
172   -
173 172 wp_register_script( 'a8c-developer', plugins_url( 'developer.js', __FILE__ ), array( 'jquery' ), self::VERSION );
174 173 $strings = array(
175 174 'settings_slug' => self::PAGE_SLUG,
@@ -189,14 +188,10 @@ public function admin_init() {
189 188
190 189 wp_register_style( 'a8c-developer', plugins_url( 'developer.css', __FILE__ ), array(), self::VERSION );
191 190
192   -
193 191 // Handle the submission of the lightbox form if step 2 won't be shown
194   - if ( ! empty( $_POST['a8c_developer_action'] ) ) {
195   - if ( 'lightbox_step_1' == $_POST['a8c_developer_action'] && ! empty( $_POST['a8c_developer_project_type'] ) && check_admin_referer( 'a8c_developer_action_lightbox_step_1' ) ) {
196   - $this->save_project_type( $_POST['a8c_developer_project_type'] );
197   -
198   - add_settings_error( 'general', 'settings_updated', __( 'Settings saved.' ), 'updated' );
199   - }
  192 + if ( ! empty( $_POST['action'] ) && 'a8c_developer_lightbox_step_1' == $_POST['action'] && ! empty( $_POST['a8c_developer_project_type'] ) && check_admin_referer( 'a8c_developer_lightbox_step_1' ) ) {
  193 + $this->save_project_type( $_POST['a8c_developer_project_type'] );
  194 + add_settings_error( 'general', 'settings_updated', __( 'Settings saved.' ), 'updated' );
200 195 }
201 196
202 197 if ( ! get_option( self::OPTION ) ) {
@@ -254,7 +249,7 @@ public function output_setup_box_html() {
254 249
255 250 <p><?php esc_html_e( 'Before we begin, what type of website are you developing?', 'a8c-developer' ); ?></p>
256 251
257   - <form id="a8c-developer-setup-dialog-step-1-form" action="options-general.php?page=a8c_developer" method="post">
  252 + <form id="a8c-developer-setup-dialog-step-1-form" action="tools.php?page=a8c_developer" method="post">
258 253 <?php wp_nonce_field( 'a8c_developer_lightbox_step_1' ); ?>
259 254 <input type="hidden" name="action" value="a8c_developer_lightbox_step_1" />
260 255

0 comments on commit 2235834

Please sign in to comment.
Something went wrong with that request. Please try again.