Skip to content

Commit

Permalink
Merge pull request #14442 from jeabakker/upmerge-4.3.9
Browse files Browse the repository at this point in the history
Upmerge 4.3.9 into 5.0
  • Loading branch information
jeabakker committed Jul 26, 2023
2 parents 01c8b7a + 88b76ee commit aaa3d02
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 4 deletions.
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,18 @@
* **plugins:** the embed plugin has been removed ([31a443c5](https://github.com/Elgg/Elgg/commit/31a443c56a48410333a08a1c0d61308f822151a9))
* **widgets:** class function saveSettings has been removed ([3c58daee](https://github.com/Elgg/Elgg/commit/3c58daeea8bfc48c099827733cbe167462043d5f))

<a name="4.3.9"></a>
### 4.3.9 (2023-07-26)

#### Contributors

* Jerôme Bakker (2)
* Nikolai Shcherbin (1)

#### Bug Fixes

* **admin:** use correct params for memcache and redis server information ([6ee26b94](https://github.com/Elgg/Elgg/commit/6ee26b94637a384af133187afb9fab766ef324da))


<a name="4.3.8"></a>
### 4.3.8 (2023-04-04)
Expand Down
10 changes: 8 additions & 2 deletions docs/admin/performance.rst
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,14 @@ Uncomment and populate the following sections in ``settings.php``
$CONFIG->memcache = true;
$CONFIG->memcache_servers = array (
array('server1', 11211),
array('server2', 11211)
array (
'host' => 'server1',
'port' => 11211
),
array (
'host' => 'server2',
'port' => 11211
)
);
Optionaly if you run multiple Elgg installations but use ony one Memcache server, you may want
Expand Down
2 changes: 1 addition & 1 deletion views/default/admin/server/memcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}

foreach ($servers as $server) {
$memcache->addserver($server[0], $server[1]);
$memcache->addserver($server['host'], $server['port']);
}

if ($memcache instanceof Memcache) {
Expand Down
2 changes: 1 addition & 1 deletion views/default/admin/server/redis.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
$redis = new Redis();

foreach ($servers as $server) {
$redis->connect($server[0], $server[1]);
$redis->connect($server['host'], $server['port']);
}

$password = elgg_extract('password', elgg_get_config('redis_options'));
Expand Down

0 comments on commit aaa3d02

Please sign in to comment.