diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-11-18 14:52:47 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-11-18 14:52:47 +0400 |
| commit | 23208b79bf25f2c0ce065953c62f155c3b96ad7e (patch) | |
| tree | 1b9ffb4eb4b1f930dfd652d944ad3698a2ebf8ae /core/Profiler.php | |
| parent | 97974b06269734b186bca7f894adf4948347709b (diff) | |
Error messages friendly to CLI output (no html, spaces displayed correctly...). Factoring out class CronArchive from archive.php.
Diffstat (limited to 'core/Profiler.php')
| -rw-r--r-- | core/Profiler.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/core/Profiler.php b/core/Profiler.php index ec48788471..731a194fc5 100644 --- a/core/Profiler.php +++ b/core/Profiler.php @@ -201,7 +201,7 @@ class Profiler require_once $path; - $currentGitBranch = self::getCurrentGitBranch(); + $currentGitBranch = SettingsPiwik::getCurrentGitBranch(); $profilerNamespace = "piwik"; if($currentGitBranch != 'master') { $profilerNamespace .= "." . $currentGitBranch; @@ -260,15 +260,6 @@ class Profiler return $array; } - private static function getCurrentGitBranch() - { - $firstLineOfGitHead = file(PIWIK_INCLUDE_PATH . '/.git/HEAD'); - $firstLineOfGitHead = $firstLineOfGitHead[0]; - $parts = explode("/", $firstLineOfGitHead); - $currentGitBranch = trim($parts[2]); - return $currentGitBranch; - } - /** * @return string */ |