Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Properly define constants after moving class outside main plugin file.

This commit is contained in:
Aristeides Stathopoulos 2017-07-11 02:53:54 +03:00 committed by Claudio Sanches
parent e7ffb9f910
commit e4bf9b3d78
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
includes/class-woocommerce.php
View File

@ -161,7 +161,7 @@ final class WooCommerce {
* @since 2.3
*/
private function init_hooks() {
register_activation_hook( __FILE__, array( 'WC_Install', 'install' ) );
register_activation_hook( WC_PLUGIN_FILE, array( 'WC_Install', 'install' ) );
register_shutdown_function( array( $this, 'log_errors' ) );
add_action( 'after_setup_theme', array( $this, 'setup_environment' ) );
add_action( 'after_setup_theme', array( $this, 'include_template_functions' ), 11 );
@ -194,9 +194,6 @@ final class WooCommerce {
private function define_constants() {
$upload_dir = wp_upload_dir();
$this->define( 'WC_PLUGIN_FILE', __FILE__ );
$this->define( 'WC_ABSPATH', dirname( __FILE__ ) . '/' );
$this->define( 'WC_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
$this->define( 'WC_VERSION', $this->version );
$this->define( 'WOOCOMMERCE_VERSION', $this->version );
$this->define( 'WC_ROUNDING_PRECISION', 4 );
@ -466,7 +463,7 @@ final class WooCommerce {
unload_textdomain( 'woocommerce' );
load_textdomain( 'woocommerce', WP_LANG_DIR . '/woocommerce/woocommerce-' . $locale . '.mo' );
load_plugin_textdomain( 'woocommerce', false, plugin_basename( dirname( __FILE__ ) ) . '/i18n/languages' );
load_plugin_textdomain( 'woocommerce', false, plugin_basename( dirname( WC_PLUGIN_FILE ) ) . '/i18n/languages' );
}
/**
@ -512,7 +509,7 @@ final class WooCommerce {
* @return string
*/
public function plugin_url() {
return untrailingslashit( plugins_url( '/', __FILE__ ) );
return untrailingslashit( plugins_url( '/', WC_PLUGIN_FILE ) );
}
/**
@ -520,7 +517,7 @@ final class WooCommerce {
* @return string
*/
public function plugin_path() {
return untrailingslashit( plugin_dir_path( __FILE__ ) );
return untrailingslashit( plugin_dir_path( WC_PLUGIN_FILE ) );
}
/**

15
woocommerce.php
View File

@ -20,6 +20,21 @@ if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
// Define WC_PLUGIN_FILE.
if ( ! defined( 'WC_PLUGIN_FILE' ) ) {
define( 'WC_PLUGIN_FILE', __FILE__ );
}
// Define WC_ABSPATH.
if ( ! defined( 'WC_ABSPATH' ) ) {
define( 'WC_ABSPATH', dirname( __FILE__ ) . '/' );
}
// Define WC_PLUGIN_BASENAME.
if ( ! defined( 'WC_PLUGIN_BASENAME' ) ) {
define( 'WC_PLUGIN_BASENAME', plugin_basename( __FILE__ ) );
}
// Include the main WooCommerce class.
if ( ! class_exists( 'WooCommerce' ) ) {
include_once dirname( __FILE__ ) . '/includes/class-woocommerce.php';