diff options
| author | fox <[email protected]> | 2021-03-08 18:50:52 +0300 |
|---|---|---|
| committer | fox <[email protected]> | 2021-03-08 18:50:52 +0300 |
| commit | 9b2267510b74557e2ecf75824c626d2a60ceece9 (patch) | |
| tree | 1aa742fe4d4c59495bb30227d2f69479fd4a90ba /classes | |
| parent | cfb48825911b8d3d1e7a3e1492f25319cc01a7f9 (diff) | |
| parent | fed5158ec50788026500a3e280b52e01e6cec883 (diff) | |
Merge pull request 'Default to null 'rv' for plugin update check.' (#17) from wn/tt-rss:inaccurate-available-plugin-updates into master
Reviewed-on: https://git.tt-rss.org/fox/tt-rss/pulls/17
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/pref/prefs.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php index 77b57b4d8..16c41df9d 100644 --- a/classes/pref/prefs.php +++ b/classes/pref/prefs.php @@ -1057,7 +1057,7 @@ class Pref_Prefs extends Handler_Protected { private static function _plugin_needs_update($root_dir, $plugin_name) { $plugin_dir = "$root_dir/plugins.local/" . basename($plugin_name); - $rv = []; + $rv = null; if (is_dir($plugin_dir) && is_dir("$plugin_dir/.git")) { $pipes = []; @@ -1071,9 +1071,11 @@ class Pref_Prefs extends Handler_Protected { $proc = proc_open("git fetch -q origin -a && git log HEAD..origin/master --oneline", $descriptorspec, $pipes, $plugin_dir); if (is_resource($proc)) { - $rv["stdout"] = stream_get_contents($pipes[1]); - $rv["stderr"] = stream_get_contents($pipes[2]); - $rv["git_status"] = proc_close($proc); + $rv = [ + "stdout" => stream_get_contents($pipes[1]), + "stderr" => stream_get_contents($pipes[2]), + "git_status" => proc_close($proc), + ]; $rv["need_update"] = !empty($rv["stdout"]); } } |