merge with branch01

This commit is contained in:
ruben- 2015-12-05 17:38:52 +01:00
parent ac5ba0c1ab
commit f942c94b3d
24 changed files with 394 additions and 176 deletions

View file

@ -80,11 +80,11 @@ class MainWP_Child_Back_WP_Up {
function mainwp_backwpup_handle_fatal_error() {
$error = error_get_last();
if ( isset( $error['type'] ) && E_ERROR === $error['type'] && isset( $error['message'] ) ) {
die( '<mainwp>' . base64_encode( serialize( array( 'error' => 'MainWP_Child fatal error : ' . $error['message'] . ' Line: ' . $error['line'] . ' File: ' . $error['file'] ) ) ) . '</mainwp>' );
MainWP_Helper::write( array( 'error' => 'MainWP_Child fatal error : ' . $error['message'] . ' Line: ' . $error['line'] . ' File: ' . $error['file'] ) );
} else if ( ! empty( MainWP_Child_Back_WP_Up::$information ) ) {
die( '<mainwp>' . base64_encode( serialize( MainWP_Child_Back_WP_Up::$information ) ) . '</mainwp>' );
MainWP_Helper::write( MainWP_Child_Back_WP_Up::$information );
} else {
die( '<mainwp>' . base64_encode( array( 'error' => 'Missing information array inside fatal_error' ) ) . '</mainwp>' );
MainWP_Helper::write( array( 'error' => 'Missing information array inside fatal_error' ) );
}
}