10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ultimatemember/ultimatemember into feature/ajax_upgrade_process

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-03-26 01:32:48 +03:00
parent 0ed52ee849 3eca951d07
commit 803c337dd9
52 changed files with 78 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/class-admin.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin' ) ) {
if ( ! class_exists( 'um\admin\Admin' ) ) {
/**
includes/admin/core/class-admin-builder.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Builder' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Builder' ) ) {
/**
includes/admin/core/class-admin-columns.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Columns' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Columns' ) ) {
/**
includes/admin/core/class-admin-dragdrop.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_DragDrop' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_DragDrop' ) ) {
/**
includes/admin/core/class-admin-enqueue.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Enqueue' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
/**
includes/admin/core/class-admin-forms-settings.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Forms_Settings' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Forms_Settings' ) ) {
/**
includes/admin/core/class-admin-forms.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Forms' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Forms' ) ) {
/**
includes/admin/core/class-admin-functions.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Functions' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Functions' ) ) {
/**
includes/admin/core/class-admin-menu.php
+1 -1
View File
@@ -6,7 +6,7 @@ use \RecursiveDirectoryIterator;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Menu' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Menu' ) ) {
/**
includes/admin/core/class-admin-metabox.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Metabox' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Metabox' ) ) {
/**
includes/admin/core/class-admin-notices.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Notices' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Notices' ) ) {
/**
includes/admin/core/class-admin-settings.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Settings' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
/**
includes/admin/core/class-admin-upgrade.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Upgrade' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Upgrade' ) ) {
/**
includes/admin/core/class-admin-users.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\admin\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Admin_Users' ) ) {
if ( ! class_exists( 'um\admin\core\Admin_Users' ) ) {
/**
includes/admin/templates/role/home.php
+1 -1
View File
@@ -11,7 +11,7 @@
'type' => 'checkbox',
'label' => __( 'Can view default homepage?', 'ultimate-member' ),
'tooltip' => __( 'Allow this user role to view your site\'s homepage', 'ultimate-member' ),
'value' => ! empty( $role['_um_default_homepage'] ) ? $role['_um_default_homepage'] : 1,
'value' => isset( $role['_um_default_homepage'] ) ? $role['_um_default_homepage'] : 1,
),
array(
'id' => '_um_redirect_homepage',
includes/core/class-access.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Access' ) ) {
if ( ! class_exists( 'um\core\Access' ) ) {
/**
includes/core/class-account.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Account' ) ) {
if ( ! class_exists( 'um\core\Account' ) ) {
/**
includes/core/class-ajax-common.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if executed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'AJAX_Common' ) ) {
if ( ! class_exists( 'um\core\AJAX_Common' ) ) {
/**
includes/core/class-builtin.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Builtin' ) ) {
if ( ! class_exists( 'um\core\Builtin' ) ) {
/**
includes/core/class-chart.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Chart' ) ) {
if ( ! class_exists( 'um\core\Chart' ) ) {
/**
includes/core/class-common.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Common' ) ) {
if ( ! class_exists( 'um\core\Common' ) ) {
/**
includes/core/class-cron.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Cron' ) ) {
if ( ! class_exists( 'um\core\Cron' ) ) {
/**
includes/core/class-date-time.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Date_Time' ) ) {
if ( ! class_exists( 'um\core\Date_Time' ) ) {
/**
includes/core/class-enqueue.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Enqueue' ) ) {
if ( ! class_exists( 'um\core\Enqueue' ) ) {
/**
includes/core/class-external-integrations.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'External_Integrations' ) ) {
if ( ! class_exists( 'um\core\External_Integrations' ) ) {
/**
includes/core/class-fields.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace um\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Fields' ) ) {
if ( ! class_exists( 'um\core\Fields' ) ) {
/**
includes/core/class-files.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Files' ) ) {
if ( ! class_exists( 'um\core\Files' ) ) {
/**
includes/core/class-fonticons.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'FontIcons' ) ) {
if ( ! class_exists( 'um\core\FontIcons' ) ) {
/**
includes/core/class-form.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Form' ) ) {
if ( ! class_exists( 'um\core\Form' ) ) {
/**
includes/core/class-login.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Login' ) ) {
if ( ! class_exists( 'um\core\Login' ) ) {
class Login {
includes/core/class-logout.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Logout' ) ) {
if ( ! class_exists( 'um\core\Logout' ) ) {
/**
includes/core/class-mail.php
+27 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Mail' ) ) {
if ( ! class_exists( 'um\core\Mail' ) ) {
/**
@@ -322,6 +322,32 @@ if ( ! class_exists( 'Mail' ) ) {
$message = ob_get_clean();
/**
* UM hook
*
* @type filter
* @title um_email_send_message_content
* @description Change email notification message content
* @input_vars
* [{"var":"$message","type":"string","desc":"Message Content"},
* {"var":"$template","type":"string","desc":"Template Key"},
* {"var":"$args","type":"string","desc":"Notification Arguments"}]
* @change_log
* ["Since: 2.0"]
* @usage
* <?php add_filter( 'um_email_send_message_content', 'function_name', 10, 3 ); ?>
* @example
* <?php
* add_filter( 'um_email_send_message_content', 'my_email_send_message_content', 10, 3 );
* function my_email_send_message_content( $message, $template, $args ) {
* // your code here
* return $message;
* }
* ?>
*/
$message = apply_filters( 'um_email_send_message_content', $message, $slug, $args );
// Convert tags in email template
return um_convert_tags( $message, $args );
}
includes/core/class-members.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Members' ) ) {
if ( ! class_exists( 'um\core\Members' ) ) {
/**
includes/core/class-modal.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Modal' ) ) {
if ( ! class_exists( 'um\core\Modal' ) ) {
/**
includes/core/class-options.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Options' ) ) {
if ( ! class_exists( 'um\core\Options' ) ) {
/**
includes/core/class-password.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Password' ) ) {
if ( ! class_exists( 'um\core\Password' ) ) {
/**
includes/core/class-permalinks.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Permalinks' ) ) {
if ( ! class_exists( 'um\core\Permalinks' ) ) {
/**
includes/core/class-plugin-updater.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Plugin_Updater' ) ) {
if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
/**
includes/core/class-profile.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Profile' ) ) {
if ( ! class_exists( 'um\core\Profile' ) ) {
/**
includes/core/class-query.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly.
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Query' ) ) {
if ( ! class_exists( 'um\core\Query' ) ) {
/**
includes/core/class-register.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Register' ) ) {
if ( ! class_exists( 'um\core\Register' ) ) {
/**
includes/core/class-rest-api.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'REST_API' ) ) {
if ( ! class_exists( 'um\core\REST_API' ) ) {
/**
includes/core/class-rewrite.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Rewrite' ) ) {
if ( ! class_exists( 'um\core\Rewrite' ) ) {
/**
includes/core/class-roles-capabilities.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace um\core;
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Roles_Capabilities' ) ) {
if ( ! class_exists( 'um\core\Roles_Capabilities' ) ) {
/**
includes/core/class-router.php
+1 -1
View File
@@ -3,7 +3,7 @@ namespace um\core;
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Router' ) ) {
if ( ! class_exists( 'um\core\Router' ) ) {
/**
includes/core/class-setup.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Setup' ) ) {
if ( ! class_exists( 'um\core\Setup' ) ) {
/**
includes/core/class-shortcodes.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Shortcodes' ) ) {
if ( ! class_exists( 'um\core\Shortcodes' ) ) {
/**
includes/core/class-tracking.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Tracking' ) ) {
if ( ! class_exists( 'um\core\Tracking' ) ) {
/**
includes/core/class-user-posts.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'User_posts' ) ) {
if ( ! class_exists( 'um\core\User_posts' ) ) {
/**
includes/core/class-user.php
+1 -1
View File
@@ -5,7 +5,7 @@ namespace um\core;
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'User' ) ) {
if ( ! class_exists( 'um\core\User' ) ) {
/**
includes/core/class-validation.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\core;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Validation' ) ) {
if ( ! class_exists( 'um\core\Validation' ) ) {
/**
includes/lib/mobiledetect/class-um-mobile-detect.php
+1 -1
View File
@@ -4,7 +4,7 @@ namespace um\lib\mobiledetect;
// Exit if accessed directly
if ( ! defined( 'ABSPATH' ) ) exit;
if ( ! class_exists( 'Um_Mobile_Detect' ) ) {
if ( ! class_exists( 'um\lib\mobiledetect\Um_Mobile_Detect' ) ) {
class Um_Mobile_Detect {
/**
* Mobile detection type.