Skip to content

Commit 8404fd2

Browse files
widozwidoz
committed
bump 3.6.5
1 parent 0293203 commit 8404fd2

13 files changed

+260
-79
lines changed

‎assets/css/pro.css.map

-7
This file was deleted.

‎backwpup.php

+13-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* Description: WordPress Backup Plugin
66
* Author: Inpsyde GmbH
77
* Author URI: http://inpsyde.com
8-
* Version: 3.6.4
8+
* Version: 3.6.5
99
* Text Domain: backwpup
1010
* Domain Path: /languages/
1111
* Network: true
@@ -117,11 +117,22 @@ private function __construct() {
117117
}
118118

119119
if ( ! self::$is_pro ) {
120+
$promoter_updater = new \Inpsyde\BackWPup\Notice\PromoterUpdater();
120121
$promoter = new \Inpsyde\BackWPup\Notice\Promoter(
121-
new \Inpsyde\BackWPup\Notice\PromoterUpdater(),
122+
$promoter_updater,
122123
new \Inpsyde\BackWPup\Notice\PromoterView()
123124
);
124125
$promoter->init();
126+
add_action( 'upgrader_process_complete', array( $promoter_updater, 'update' ) );
127+
add_filter(
128+
'pre_set_site_transient_update_plugins',
129+
function ( $value ) use ( $promoter_updater ) {
130+
131+
$promoter_updater->update();
132+
133+
return $value;
134+
}
135+
);
125136

126137
$this->home_phone_client_init();
127138
}

‎changelog.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
== Changelog ==
2+
= Version 3.6.5 =
3+
Release Date: Nov 23, 2018
4+
5+
* Fixed: Admin notice won’t update correctly
6+
27
= Version 3.6.4 =
38
Release Date: Nov, 22, 2018
49

‎inc/Notice/Promoter.php

+2-4
Original file line numberDiff line numberDiff line change
@@ -119,10 +119,8 @@ private function message() {
119119
? get_site_transient( self::OPTION_NAME )
120120
: get_transient( self::OPTION_NAME );
121121

122-
$data_message = array_filter( (array) $data_message );
123-
124-
if ( ! $data_message ) {
125-
add_action( 'shutdown', array( $this->updater, 'update' ) );
122+
if ( false === $data_message ) {
123+
$data_message = $this->updater->update();
126124
}
127125

128126
if ( isset( $data_message[ $locale_code ] ) ) {

‎inc/Notice/PromoterUpdater.php

+26-4
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,58 @@ class PromoterUpdater {
1414
*/
1515
public function update() {
1616

17-
$api_response = wp_remote_get( self::URL );
17+
$api_response = wp_remote_get( self::URL, array( 'timeout' => 3 ) );
1818
if ( is_wp_error( $api_response ) ) {
1919
return array();
2020
}
2121
if ( 200 !== $api_response['response']['code'] ) {
2222
return array();
2323
}
2424

25-
$messages = json_decode( wp_remote_retrieve_body( $api_response ), true );
25+
$json = $this->clean_json( wp_remote_retrieve_body( $api_response ) );
26+
$messages = json_decode( $json, true );
2627
if ( json_last_error() !== JSON_ERROR_NONE ) {
2728
return array();
2829
}
2930

31+
$data = array();
3032
foreach ( $messages as $language => $remote_data ) {
3133
$data[ $language ] = wp_parse_args(
3234
$remote_data,
3335
PromoterMessage::defaults()
3436
);
3537
}
3638

39+
$expiration_time = DAY_IN_SECONDS / 2;
40+
3741
is_multisite() ?
3842
set_site_transient(
3943
Promoter::OPTION_NAME,
4044
$data,
41-
DAY_IN_SECONDS
45+
$expiration_time
4246
) :
4347
set_transient(
4448
Promoter::OPTION_NAME,
4549
$data,
46-
DAY_IN_SECONDS
50+
$expiration_time
4751
);
52+
53+
return $data;
54+
}
55+
56+
/**
57+
* @param $json
58+
*
59+
* @return mixed
60+
*/
61+
private function clean_json( $json ) {
62+
63+
$json = str_replace(
64+
array( "\n", "\t", "\r" ),
65+
'',
66+
$json
67+
);
68+
69+
return str_replace( '},}', '}}', $json );
4870
}
4971
}

‎languages/backwpup.pot

+42-42
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ msgstr ""
1010
"MIME-Version: 1.0\n"
1111
"Content-Type: text/plain; charset=UTF-8\n"
1212
"Content-Transfer-Encoding: 8bit\n"
13-
"POT-Creation-Date: 2018-11-14T12:29:29+00:00\n"
14-
"PO-Revision-Date: 2018-11-14T12:29:29+00:00\n"
13+
"POT-Creation-Date: 2018-11-23T14:39:13+00:00\n"
14+
"PO-Revision-Date: 2018-11-23T14:39:13+00:00\n"
1515
"X-Domain: backwpup\n"
1616

1717
#: inc/class-adminbar.php:51
@@ -921,8 +921,8 @@ msgid "Added XML export \"%1$s\" with %2$s to backup file list."
921921
msgstr ""
922922

923923
#: inc/class-destination-s3.php:44
924-
#: dist/backwpup.php:357
925-
#: backwpup.php:357
924+
#: dist/backwpup.php:368
925+
#: backwpup.php:368
926926
msgid "S3 Service"
927927
msgstr ""
928928

@@ -1298,8 +1298,8 @@ msgid "File"
12981298
msgstr ""
12991299

13001300
#: inc/class-page-backups.php:218
1301-
#: dist/backwpup.php:293
1302-
#: backwpup.php:293
1301+
#: dist/backwpup.php:304
1302+
#: backwpup.php:304
13031303
msgid "Folder"
13041304
msgstr ""
13051305

@@ -1675,8 +1675,8 @@ msgid "Error transfering backup to %s."
16751675
msgstr ""
16761676

16771677
#: inc/class-destination-dropbox.php:445
1678-
#: dist/backwpup.php:341
1679-
#: backwpup.php:341
1678+
#: dist/backwpup.php:352
1679+
#: backwpup.php:352
16801680
msgid "Dropbox"
16811681
msgstr ""
16821682

@@ -2383,14 +2383,14 @@ msgid "Backup to S3 services (Amazon, Google Storage, Hosteurope and more)"
23832383
msgstr ""
23842384

23852385
#: inc/class-page-about.php:508
2386-
#: dist/backwpup.php:342
2387-
#: backwpup.php:342
2386+
#: dist/backwpup.php:353
2387+
#: backwpup.php:353
23882388
msgid "Backup to Dropbox"
23892389
msgstr ""
23902390

23912391
#: inc/class-page-about.php:513
2392-
#: dist/backwpup.php:395
2393-
#: backwpup.php:395
2392+
#: dist/backwpup.php:406
2393+
#: backwpup.php:406
23942394
msgid "Backup to Rackspace Cloud Files"
23952395
msgstr ""
23962396

@@ -2403,8 +2403,8 @@ msgid "Backup to your web space"
24032403
msgstr ""
24042404

24052405
#: inc/class-page-about.php:528
2406-
#: dist/backwpup.php:415
2407-
#: backwpup.php:415
2406+
#: dist/backwpup.php:426
2407+
#: backwpup.php:426
24082408
msgid "Backup to SugarSync"
24092409
msgstr ""
24102410

@@ -4101,73 +4101,73 @@ msgstr[0] ""
41014101
msgid "SugarSync API: %s"
41024102
msgstr ""
41034103

4104-
#: dist/backwpup.php:294
4105-
#: backwpup.php:294
4104+
#: dist/backwpup.php:305
4105+
#: backwpup.php:305
41064106
msgid "Backup to Folder"
41074107
msgstr ""
41084108

4109-
#: dist/backwpup.php:309
4110-
#: backwpup.php:309
4109+
#: dist/backwpup.php:320
4110+
#: backwpup.php:320
41114111
msgid "Email"
41124112
msgstr ""
41134113

4114-
#: dist/backwpup.php:310
4115-
#: backwpup.php:310
4114+
#: dist/backwpup.php:321
4115+
#: backwpup.php:321
41164116
msgid "Backup sent via email"
41174117
msgstr ""
41184118

4119-
#: dist/backwpup.php:325
4120-
#: backwpup.php:325
4119+
#: dist/backwpup.php:336
4120+
#: backwpup.php:336
41214121
msgid "FTP"
41224122
msgstr ""
41234123

4124-
#: dist/backwpup.php:326
4125-
#: backwpup.php:326
4124+
#: dist/backwpup.php:337
4125+
#: backwpup.php:337
41264126
msgid "Backup to FTP"
41274127
msgstr ""
41284128

4129-
#: dist/backwpup.php:358
4130-
#: backwpup.php:358
4129+
#: dist/backwpup.php:369
4130+
#: backwpup.php:369
41314131
msgid "Backup to an S3 Service"
41324132
msgstr ""
41334133

4134-
#: dist/backwpup.php:378
4135-
#: backwpup.php:378
4134+
#: dist/backwpup.php:389
4135+
#: backwpup.php:389
41364136
msgid "MS Azure"
41374137
msgstr ""
41384138

4139-
#: dist/backwpup.php:379
4140-
#: backwpup.php:379
4139+
#: dist/backwpup.php:390
4140+
#: backwpup.php:390
41414141
msgid "Backup to Microsoft Azure (Blob)"
41424142
msgstr ""
41434143

4144-
#: dist/backwpup.php:394
4145-
#: backwpup.php:394
4144+
#: dist/backwpup.php:405
4145+
#: backwpup.php:405
41464146
msgid "RSC"
41474147
msgstr ""
41484148

4149-
#: dist/backwpup.php:414
4150-
#: backwpup.php:414
4149+
#: dist/backwpup.php:425
4150+
#: backwpup.php:425
41514151
msgid "SugarSync"
41524152
msgstr ""
41534153

4154-
#: dist/backwpup.php:443
4155-
#: backwpup.php:443
4154+
#: dist/backwpup.php:454
4155+
#: backwpup.php:454
41564156
msgid "PHP Version %1$s is to low, you need Version %2$s or above."
41574157
msgstr ""
41584158

4159-
#: dist/backwpup.php:455
4160-
#: backwpup.php:455
4159+
#: dist/backwpup.php:466
4160+
#: backwpup.php:466
41614161
msgid "Missing function \"%s\"."
41624162
msgstr ""
41634163

4164-
#: dist/backwpup.php:468
4165-
#: backwpup.php:468
4164+
#: dist/backwpup.php:479
4165+
#: backwpup.php:479
41664166
msgid "Missing class \"%s\"."
41674167
msgstr ""
41684168

4169-
#: dist/backwpup.php:589
4170-
#: backwpup.php:589
4169+
#: dist/backwpup.php:600
4170+
#: backwpup.php:600
41714171
msgid "BackWPup requires PHP version %$1s with spl extension or greater and WordPress %$2s or greater."
41724172
msgstr ""
41734173

‎vendor/autoload.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44

55
require_once __DIR__ . '/composer/autoload_real.php';
66

7-
return ComposerAutoloaderInita23585b901400be6b5d85b7b0e980aa9::getLoader();
7+
return ComposerAutoloaderInite22f446265f3e2b8ba85031429865baf::getLoader();

‎vendor/composer/autoload_classmap.php

+1
Original file line numberDiff line numberDiff line change
@@ -1871,6 +1871,7 @@
18711871
'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
18721872
'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
18731873
'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
1874+
'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
18741875
'Symfony\\Component\\EventDispatcher\\ContainerAwareEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/ContainerAwareEventDispatcher.php',
18751876
'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcher' => $vendorDir . '/symfony/event-dispatcher/Debug/TraceableEventDispatcher.php',
18761877
'Symfony\\Component\\EventDispatcher\\Debug\\TraceableEventDispatcherInterface' => $vendorDir . '/symfony/event-dispatcher/Debug/TraceableEventDispatcherInterface.php',

‎vendor/composer/autoload_real.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInita23585b901400be6b5d85b7b0e980aa9
5+
class ComposerAutoloaderInite22f446265f3e2b8ba85031429865baf
66
{
77
private static $loader;
88

@@ -19,9 +19,9 @@ public static function getLoader()
1919
return self::$loader;
2020
}
2121

22-
spl_autoload_register(array('ComposerAutoloaderInita23585b901400be6b5d85b7b0e980aa9', 'loadClassLoader'), true, true);
22+
spl_autoload_register(array('ComposerAutoloaderInite22f446265f3e2b8ba85031429865baf', 'loadClassLoader'), true, true);
2323
self::$loader = $loader = new \Composer\Autoload\ClassLoader();
24-
spl_autoload_unregister(array('ComposerAutoloaderInita23585b901400be6b5d85b7b0e980aa9', 'loadClassLoader'));
24+
spl_autoload_unregister(array('ComposerAutoloaderInite22f446265f3e2b8ba85031429865baf', 'loadClassLoader'));
2525

2626
$includePaths = require __DIR__ . '/include_paths.php';
2727
$includePaths[] = get_include_path();
@@ -31,7 +31,7 @@ public static function getLoader()
3131
if ($useStaticLoader) {
3232
require_once __DIR__ . '/autoload_static.php';
3333

34-
call_user_func(\Composer\Autoload\ComposerStaticInita23585b901400be6b5d85b7b0e980aa9::getInitializer($loader));
34+
call_user_func(\Composer\Autoload\ComposerStaticInite22f446265f3e2b8ba85031429865baf::getInitializer($loader));
3535
} else {
3636
$map = require __DIR__ . '/autoload_namespaces.php';
3737
foreach ($map as $namespace => $path) {
@@ -52,19 +52,19 @@ public static function getLoader()
5252
$loader->register(true);
5353

5454
if ($useStaticLoader) {
55-
$includeFiles = Composer\Autoload\ComposerStaticInita23585b901400be6b5d85b7b0e980aa9::$files;
55+
$includeFiles = Composer\Autoload\ComposerStaticInite22f446265f3e2b8ba85031429865baf::$files;
5656
} else {
5757
$includeFiles = require __DIR__ . '/autoload_files.php';
5858
}
5959
foreach ($includeFiles as $fileIdentifier => $file) {
60-
composerRequirea23585b901400be6b5d85b7b0e980aa9($fileIdentifier, $file);
60+
composerRequiree22f446265f3e2b8ba85031429865baf($fileIdentifier, $file);
6161
}
6262

6363
return $loader;
6464
}
6565
}
6666

67-
function composerRequirea23585b901400be6b5d85b7b0e980aa9($fileIdentifier, $file)
67+
function composerRequiree22f446265f3e2b8ba85031429865baf($fileIdentifier, $file)
6868
{
6969
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
7070
require $file;

0 commit comments

Comments
 (0)