Skip to content

Commit 6e7cd22

Browse files
committed
Fix: PHP Fatal error: Uncaught TypeError
1 parent 7c4a0c9 commit 6e7cd22

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

inc/addons/custom-icons.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,9 @@ private function _add_hooks() {
168168
*/
169169
public function load_icons( $icons ) {
170170
$custom = $this->_get_custom_icons();
171+
if (!is_array($custom)) {
172+
$custom = array(); // or handle this case as appropriate
173+
}
171174
return array_merge( $icons, $custom );
172175
}
173176

readme.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,10 @@ Halte Dich mit unserem [Newsletter](https://n3rds.work/webmasterservice-n3rdswor
7575

7676
== ChangeLog ==
7777

78+
= 3.1.0 =
79+
80+
* Fix: PHP Fatal error: Uncaught TypeError: array_merge()
81+
7882
= 3.0.9 =
7983

8084
* Deprecated jQuery Fixes

0 commit comments

Comments
 (0)