From a8572a71823a500d003cd148333a781b0a59cdab Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 25 Jun 2013 22:14:50 +0400
Subject: login page: remove version

---
 include/login_form.php | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'include')

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 } ?>
 	&copy; 2005&ndash;<?php echo date('Y') ?> <a href="http://fakecake.org/">Andrew Dolgov</a>
 </div>
 
-- 
cgit v1.2.3-54-g00ecf


From 3cda9e2a404ffc71789c5fbd2de389a1084e8b85 Mon Sep 17 00:00:00 2001
From: craywolf <craywolf@example.com>
Date: Wed, 26 Jun 2013 09:20:03 -0400
Subject: Fix version in preferences footer

---
 include/version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

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 {
-- 
cgit v1.2.3-54-g00ecf