Skip to content

Commit

Permalink
Update JETPACK__PLUGIN_FOLDER remove JPBETA__PLUGIN_BASENAME
Browse files Browse the repository at this point in the history
  • Loading branch information
enejb committed Apr 21, 2017
1 parent 70b80d9 commit de3c5d1
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
6 changes: 3 additions & 3 deletions autoupdate-self.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ public function __construct() {
}

$this->config = array(
'plugin_file' => JPBETA__PLUGIN_BASENAME . '/jetpack-beta.php',
'slug' => JPBETA__PLUGIN_BASENAME,
'proper_folder_name' => JPBETA__PLUGIN_BASENAME,
'plugin_file' => JPBETA__PLUGIN_FOLDER . '/jetpack-beta.php',
'slug' => JPBETA__PLUGIN_FOLDER,
'proper_folder_name' => JPBETA__PLUGIN_FOLDER,
'api_url' => 'https://api.github.com/repos/Automattic/jetpack-beta',
'github_url' => 'https://github.com/Automattic/jetpack-beta',
'requires' => '4.7',
Expand Down
2 changes: 1 addition & 1 deletion jetpack-beta-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ static function add_actions() {
add_action( "load-$hook", array( __CLASS__, 'admin_page_load' ) );
add_action( "admin_print_styles-$hook", array( __CLASS__, 'admin_styles' ) );
add_action( "admin_print_scripts-$hook", array( __CLASS__, 'admin_scripts' ) );
add_filter( 'plugin_action_links_' . JPBETA__PLUGIN_BASENAME . '/jetpack-beta.php', array( __CLASS__, 'admin_plugin_settings_link' ) );
add_filter( 'plugin_action_links_' . JPBETA__PLUGIN_FOLDER . '/jetpack-beta.php', array( __CLASS__, 'admin_plugin_settings_link' ) );
}

static function get_page_hook() {
Expand Down
3 changes: 1 addition & 2 deletions jetpack-beta.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,9 @@
* Jetpack beta manages files inside jetpack-dev folder this folder should contain
*
*/
define( 'JPBETA__PLUGIN_FOLDER', plugin_dir_url( __FILE__ ) );
define( 'JPBETA__PLUGIN_FOLDER', basename( __DIR__ ) );
define( 'JPBETA__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
define( 'JPBETA__PLUGIN_FILE', __FILE__ );
define( 'JPBETA__PLUGIN_BASENAME', dirname( plugin_basename( __FILE__ ) ) );
define( 'JPBETA_VERSION', 2 );

define( 'JPBETA_DEFAULT_BRANCH', 'rc_only' );
Expand Down

0 comments on commit de3c5d1

Please sign in to comment.