diff options
| author | justauser <[email protected]> | 2013-06-27 11:57:49 -0400 |
|---|---|---|
| committer | justauser <[email protected]> | 2013-06-27 11:57:49 -0400 |
| commit | 7171f32dc5ace4f36e1e70605ae96ebdbdf25c4f (patch) | |
| tree | e998d4fca34cebe801c982d1d7bf8932adbf218a /include | |
| parent | 891e36f57e2e3955a4f13019e8fdc58fce826434 (diff) | |
| parent | fac096405338e0f46fa248320318436d862678fc (diff) | |
Merge remote-tracking branch 'origin' into hookhead
Conflicts:
classes/feeds.php
fix for merging up to the origin
Diffstat (limited to 'include')
| -rw-r--r-- | include/login_form.php | 3 | ||||
| -rw-r--r-- | include/version.php | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/include/login_form.php b/include/login_form.php index 891e25e13..3d2c957a7 100644 --- a/include/login_form.php +++ b/include/login_form.php @@ -246,9 +246,6 @@ function bwLimitChange(elem) { <div class='footer'> <a href="http://tt-rss.org/">Tiny Tiny RSS</a> - <?php if (!defined('HIDE_VERSION')) { ?> - v<?php echo VERSION ?> - <?php } ?> © 2005–<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a> </div> diff --git a/include/version.php b/include/version.php index c58dc3a19..460c189d6 100644 --- a/include/version.php +++ b/include/version.php @@ -5,9 +5,9 @@ date_default_timezone_set('UTC'); $root_dir = dirname(dirname(__FILE__)); - if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/ORIG_HEAD")) { + if (is_dir("$root_dir/.git") && file_exists("$root_dir/.git/refs/heads/master")) { - $suffix = substr(trim(file_get_contents("$root_dir/.git/ORIG_HEAD")), 0, 7); + $suffix = substr(trim(file_get_contents("$root_dir/.git/refs/heads/master")), 0, 7); return VERSION_STATIC . ".$suffix"; } else { |