diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-27 03:56:56 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-27 03:56:56 +0300 |
commit | 0c80a9be897972650d3e176943c0c63fcddcd6ca (patch) | |
tree | 7115929216c7969ff167cb5deb17777bb02aa7f2 /plugins/CoreConsole | |
parent | 9ea42bb907d9ddbb1ca7e0868e34b3a46de1973e (diff) | |
parent | 7bab10fc9dd46037e39e5cbb3dcca2b420528051 (diff) |
Merge branch 'di-config' into tmp-path
Conflicts:
tests/PHPUnit/Integration/LogTest.php
Diffstat (limited to 'plugins/CoreConsole')
-rw-r--r-- | plugins/CoreConsole/Commands/GitCommit.php | 3 | ||||
-rw-r--r-- | plugins/CoreConsole/Commands/GitPull.php | 3 | ||||
-rw-r--r-- | plugins/CoreConsole/Commands/GitPush.php | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/plugins/CoreConsole/Commands/GitCommit.php b/plugins/CoreConsole/Commands/GitCommit.php index 5b3dc4ca30..451ecb72ff 100644 --- a/plugins/CoreConsole/Commands/GitCommit.php +++ b/plugins/CoreConsole/Commands/GitCommit.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; use Piwik\Development; use Piwik\Plugin\ConsoleCommand; +use Piwik\SettingsPiwik; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Output\OutputInterface; @@ -21,7 +22,7 @@ class GitCommit extends ConsoleCommand { public function isEnabled() { - return Development::isEnabled(); + return Development::isEnabled() && SettingsPiwik::isGitDeployment(); } protected function configure() diff --git a/plugins/CoreConsole/Commands/GitPull.php b/plugins/CoreConsole/Commands/GitPull.php index 65151e2e3c..e69c13bf10 100644 --- a/plugins/CoreConsole/Commands/GitPull.php +++ b/plugins/CoreConsole/Commands/GitPull.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; use Piwik\Development; use Piwik\Plugin\ConsoleCommand; +use Piwik\SettingsPiwik; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -20,7 +21,7 @@ class GitPull extends ConsoleCommand { public function isEnabled() { - return Development::isEnabled(); + return SettingsPiwik::isGitDeployment(); } protected function configure() diff --git a/plugins/CoreConsole/Commands/GitPush.php b/plugins/CoreConsole/Commands/GitPush.php index 25c838e08c..006becaa5c 100644 --- a/plugins/CoreConsole/Commands/GitPush.php +++ b/plugins/CoreConsole/Commands/GitPush.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\CoreConsole\Commands; use Piwik\Development; use Piwik\Plugin\ConsoleCommand; +use Piwik\SettingsPiwik; use Symfony\Component\Console\Input\InputInterface; use Symfony\Component\Console\Output\OutputInterface; @@ -20,7 +21,7 @@ class GitPush extends ConsoleCommand { public function isEnabled() { - return Development::isEnabled(); + return Development::isEnabled() && SettingsPiwik::isGitDeployment(); } protected function configure() |