diff options
| author | Pim van den Berg | 2015-06-22 10:26:24 +0200 |
|---|---|---|
| committer | Pim van den Berg | 2015-06-22 10:26:24 +0200 |
| commit | 3fe58691d1891d2f850d94298d98f2b8d2b76c1c (patch) | |
| tree | 780c22fba0d158af84354e64272a986bdb3319b2 /graph.php | |
| parent | Merge branch 'local_plugins' (diff) | |
| download | apt-panopticon_cgp-3fe58691d1891d2f850d94298d98f2b8d2b76c1c.zip apt-panopticon_cgp-3fe58691d1891d2f850d94298d98f2b8d2b76c1c.tar.gz apt-panopticon_cgp-3fe58691d1891d2f850d94298d98f2b8d2b76c1c.tar.bz2 apt-panopticon_cgp-3fe58691d1891d2f850d94298d98f2b8d2b76c1c.tar.xz | |
plugin: move local plugins from conf/plugin to plugin/local
Diffstat (limited to '')
| -rw-r--r-- | graph.php | 12 |
1 files changed, 6 insertions, 6 deletions
| @@ -44,14 +44,14 @@ if(function_exists('json_decode')) | |||
| 44 | if (is_null($plugin_json)) | 44 | if (is_null($plugin_json)) |
| 45 | error_log('CGP Error: invalid json in plugin/'.$plugin.'.json'); | 45 | error_log('CGP Error: invalid json in plugin/'.$plugin.'.json'); |
| 46 | } | 46 | } |
| 47 | if (file_exists('conf/plugin/'.$plugin.'.json')) { | 47 | if (file_exists('plugin/local/'.$plugin.'.json')) { |
| 48 | $json = file_get_contents('conf/plugin/'.$plugin.'.json'); | 48 | $json = file_get_contents('plugin/local/'.$plugin.'.json'); |
| 49 | $user_plugin_json = json_decode($json, true); | 49 | $plugin_json_local = json_decode($json, true); |
| 50 | 50 | ||
| 51 | if (is_null($user_plugin_json)) | 51 | if (is_null($plugin_json_local)) |
| 52 | error_log('CGP Error: invalid json in conf/plugin/'.$plugin.'.json'); | 52 | error_log('CGP Error: invalid json in plugin/local/'.$plugin.'.json'); |
| 53 | 53 | ||
| 54 | $plugin_json = array_replace_recursive($plugin_json, $user_plugin_json); | 54 | $plugin_json = array_replace_recursive($plugin_json, $plugin_json_local); |
| 55 | } | 55 | } |
| 56 | } | 56 | } |
| 57 | 57 | ||