diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-07 03:10:09 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-07 03:10:09 -0400 |
commit | bc69a957dc875b699240827cb4af2691f8a8fcd6 (patch) | |
tree | 28442b76b1c8fec40235445d62b01c182f770b5f /include/plugin.php | |
parent | 43d5876e8b35d53a0bef5248c5d63e5bc209dbbf (diff) | |
parent | ecabe1d505464577fdc3d3ff0090371c8ca0cf1e (diff) | |
download | volse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.tar.gz volse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.tar.bz2 volse-hubzilla-bc69a957dc875b699240827cb4af2691f8a8fcd6.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
ignore removed plugins
fix messed up config tables w/ duplicate entries
small fixes for the German strings
fix bad sql update
revert config changes, we're getting duplicate keys
new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...
* master:
Diffstat (limited to 'include/plugin.php')
-rw-r--r-- | include/plugin.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/plugin.php b/include/plugin.php index e37ae8435..8196e8756 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -17,7 +17,12 @@ function uninstall_plugin($plugin){ }} if (! function_exists('install_plugin')){ -function install_plugin($plugin){ +function install_plugin($plugin) { + + // silently fail if plugin was removed + + if(! file_exists('addon/' . $plugin . '/' . $plugin . '.php')) + return false; logger("Addons: installing " . $plugin); $t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php'); @include_once('addon/' . $plugin . '/' . $plugin . '.php'); @@ -32,9 +37,11 @@ function install_plugin($plugin){ intval($t), $plugin_admin ); + return true; } else { logger("Addons: FAILED installing " . $plugin); + return false; } }} |