Skip to content

Commit

Permalink
Merge branch '3.x' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
daftspunk committed Oct 8, 2024
2 parents 7045215 + 0ba3095 commit 9d82cb1
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 1 deletion.
3 changes: 3 additions & 0 deletions src/Composer/Concerns/HasAssertions.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ protected function assertEnvironmentReady()
ini_set('max_input_time', 0);
ini_set('max_execution_time', 0);

// Fixes function throwing an error
require_once __DIR__ . '/../resources/file_get_contents.php';

// Function may be disabled for security reasons
if (!function_exists('putenv')) {
require_once __DIR__ . '/../resources/putenv.php';
Expand Down
15 changes: 15 additions & 0 deletions src/Composer/resources/file_get_contents.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?php

/**
* This prevents file_get_contents from throwing an exception.
*/
namespace Composer\Repository
{
/**
* file_get_contents is not suppressed in composer
*/
function file_get_contents(...$args)
{
return @\file_get_contents(...$args);
}
}
1 change: 1 addition & 0 deletions src/Database/Concerns/HasReplication.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
/**
* HasReplication for a model
*
* @see October\Rain\Database\Replicator
* @package october\database
* @author Alexey Bobkov, Samuel Georges
*/
Expand Down
2 changes: 1 addition & 1 deletion src/Database/Traits/Multisite.php
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ public function isMultisiteSyncEnabled()
return false;
}

if (!is_array($this->propagatableSync)) {
if (is_array($this->propagatableSync)) {
return ($this->propagatableSync['sync'] ?? false) !== false;
}

Expand Down

0 comments on commit 9d82cb1

Please sign in to comment.