diff --git a/.travis.yml b/.travis.yml index e73a5fb4..b34a21b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,8 @@ # Tell Travis CI we're using PHP language: php +dist: trusty + # Setup a global environment and overide as needed env: global: @@ -90,7 +92,7 @@ before_script: - chmod +x ./tests/prepare-wordpress.sh - chmod +x ./tests/run-travis.sh - ./tests/prepare-wordpress.sh - - mysql -e "set global wait_timeout = 3600;" + ## - mysql -e "set global wait_timeout = 3600;" script: - ./tests/run-travis.sh diff --git a/includes/core/class-ajax-common.php b/includes/core/class-ajax-common.php index 5b1907af..a79ca498 100644 --- a/includes/core/class-ajax-common.php +++ b/includes/core/class-ajax-common.php @@ -26,8 +26,9 @@ if ( ! class_exists( 'um\core\AJAX_Common' ) ) { add_action( 'wp_ajax_um_' . $action, array( $this, $action ) ); - if ( $nopriv ) + if ( $nopriv ){ add_action( 'wp_ajax_nopriv_um_' . $action, array( $this, $action ) ); + } } diff --git a/includes/core/class-enqueue.php b/includes/core/class-enqueue.php index 62cc8c2b..b2dce4ee 100644 --- a/includes/core/class-enqueue.php +++ b/includes/core/class-enqueue.php @@ -144,9 +144,10 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { /** - * + * Register styles */ function register_styles() { + //FontAwesome and FontIcons styles wp_register_style( 'um_fonticons_ii', $this->css_baseurl . 'um-fonticons-ii.css', array(), ultimatemember_version ); wp_register_style( 'um_fonticons_fa', $this->css_baseurl . 'um-fonticons-fa.css', array(), ultimatemember_version ); @@ -173,6 +174,7 @@ if ( ! class_exists( 'um\core\Enqueue' ) ) { wp_register_style( 'um_profile', $this->css_baseurl . 'um-profile.css', array(), ultimatemember_version ); wp_register_style( 'um_account', $this->css_baseurl . 'um-account.css', array(), ultimatemember_version ); wp_register_style( 'um_misc', $this->css_baseurl . 'um-misc.css', array(), ultimatemember_version ); + }