Skip to content

Commit dcad9d1

Browse files
yurabakhtinyurabakhtin
committed
Merge branch 'develop' into 7.0dev
2 parents 9151da8 + 8d4115a commit dcad9d1

25 files changed

Lines changed: 148 additions & 101 deletions

‎htsrv/action.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121

2222
global $Session, $modules;
2323

24+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
25+
// in order to don't break the response data:
26+
$allow_evo_stats = false;
27+
2428
// Module name param must exists
2529
$module_name = param( 'mname', 'string', true );
2630

‎htsrv/anon_async.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
// Do not append Debug JSlog to response!
5252
$debug_jslog = false;
5353

54+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
55+
// in order to don't break the response data:
56+
$allow_evo_stats = false;
57+
5458
// Init AJAX log
5559
$Ajaxlog = new Log();
5660

‎htsrv/async.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
// Do not append Debug JSlog to response!
6262
$debug_jslog = false;
6363

64+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
65+
// in order to don't break the response data:
66+
$allow_evo_stats = false;
67+
6468
// Init AJAX log
6569
$Ajaxlog = new Log();
6670

‎htsrv/call_plugin.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@
2222
require_once dirname(__FILE__).'/../conf/_config.php';
2323
require_once $inc_path.'_main.inc.php';
2424

25+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
26+
// in order to don't break the response data:
27+
$allow_evo_stats = false;
28+
2529

2630
param( 'plugin_ID', 'integer', true );
2731
// fp> it is probably unnecessary complexity to handle a method here

‎htsrv/download.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,11 @@
2121
*/
2222
require_once $inc_path.'_main.inc.php';
2323

24+
25+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
26+
// in order to don't break the response data:
27+
$allow_evo_stats = false;
28+
2429
/* ------------ Insert a goal hit in DB ------------ */
2530
param( 'key', 'string', '' );
2631
if( ! empty( $key ) )

‎htsrv/getfile.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
require_once dirname(__FILE__).'/../conf/_config.php';
2828
require_once $inc_path.'/_main.inc.php';
2929

30+
31+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
32+
// in order to don't break the response data:
33+
$allow_evo_stats = false;
34+
3035
if( ! isset($GLOBALS['files_Module']) )
3136
{
3237
debug_die( 'Files module is disabled or missing!' );

‎htsrv/quick_upload.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ function out_echo( $message ,$specialchars )
221221
// Do not append Debug JSlog to response!
222222
$debug_jslog = false;
223223

224+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
225+
// in order to don't break the response data:
226+
$allow_evo_stats = false;
227+
224228
global $current_User;
225229

226230
param( 'upload', 'boolean', true );

‎htsrv/rest.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@
2424
require_once $inc_path.'_main.inc.php';
2525

2626

27+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
28+
// in order to don't break the response data:
29+
$allow_evo_stats = false;
30+
2731
// We can't display standard error messages. We must return REST API responses:
2832
$DB->halt_on_error = false;
2933
$DB->show_errors = false;

‎htsrv/track.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@
2828
*/
2929
require_once $inc_path.'_main.inc.php';
3030

31+
32+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
33+
// in order to don't break the response data:
34+
$allow_evo_stats = false;
35+
3136
param( 'key', 'string', '' );
3237

3338
$GoalCache = & get_GoalCache();

‎htsrv/trackback.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
// Do not append Debug JSlog to response!
3434
$debug_jslog = false;
3535

36+
// Don't check new updates from b2evolution.net (@see b2evonet_get_updates()),
37+
// in order to don't break the response data:
38+
$allow_evo_stats = false;
39+
3640
/**
3741
* Send a trackback response and exits.
3842
*

0 commit comments

Comments
 (0)