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

@ -186,7 +186,7 @@ class MainWP_Child_Updraft_Plus_Backups {
function save_settings() {
$settings = unserialize( base64_decode( $_POST['settings'] ) );
$settings = maybe_unserialize( base64_decode( $_POST['settings'] ) );
$keys = $this->get_settings_keys();
@ -271,7 +271,7 @@ class MainWP_Child_Updraft_Plus_Backups {
return array( 'error' => 'NO_PREMIUM' );
}
$addons_options = unserialize( base64_decode( $_POST['addons_options'] ) );
$addons_options = maybe_unserialize( base64_decode( $_POST['addons_options'] ) );
if ( ! is_array( $addons_options ) ) {
$addons_options = array();
}