diff options
Diffstat (limited to '')
-rw-r--r-- | graph.php | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -51,7 +51,11 @@ if(function_exists('json_decode')) | |||
51 | if (is_null($plugin_json_local)) | 51 | if (is_null($plugin_json_local)) |
52 | error_log('CGP Error: invalid json in plugin/local/'.$plugin.'.json'); | 52 | error_log('CGP Error: invalid json in plugin/local/'.$plugin.'.json'); |
53 | 53 | ||
54 | $plugin_json = array_replace_recursive($plugin_json, $plugin_json_local); | 54 | if (is_array($plugin_json)) { |
55 | $plugin_json = array_replace_recursive($plugin_json, $plugin_json_local); | ||
56 | } else { | ||
57 | $plugin_json = $plugin_json_local; | ||
58 | } | ||
55 | } | 59 | } |
56 | } | 60 | } |
57 | 61 | ||