Merge with branch01

This commit is contained in:
ruben- 2016-08-18 20:51:19 +02:00
parent 600069e51d
commit d2395d5c4a
2 changed files with 2689 additions and 1 deletions

File diff suppressed because it is too large Load diff

View file

@ -146,7 +146,8 @@ class MainWP_Child {
'wp_rocket' => 'wp_rocket',
'settings_tools' => 'settings_tools',
'skeleton_key' => 'skeleton_key',
'custom_post_type' => 'custom_post_type'
'custom_post_type' => 'custom_post_type',
'backup_buddy' => 'backup_buddy',
);
private $FTP_ERROR = 'Failed, please add FTP details for automatic upgrades.';
@ -1249,6 +1250,7 @@ class MainWP_Child {
MainWP_Child_Back_WP_Up::Instance()->init();
new MainWP_Child_Back_Up_Buddy();
//Call the function required
if ( $auth && isset( $_POST['function'] ) && isset( $this->callableFunctions[ $_POST['function'] ] ) ) {
@ -4640,6 +4642,10 @@ class MainWP_Child {
MainWP_Custom_Post_Type::Instance()->action();
}
function backup_buddy() {
MainWP_Child_Back_Up_Buddy::Instance()->action();
}
static function fix_for_custom_themes() {
if ( file_exists( ABSPATH . '/wp-admin/includes/screen.php' ) ) {
include_once( ABSPATH . '/wp-admin/includes/screen.php' );