public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-04 09:29:15 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin' into hookhead

Browse Source 
Conflicts:
	classes/feeds.php

fix for merging up to the origin
This commit is contained in:
justauser
2013-06-27 11:57:49 -04:00
parent 891e36f57e fac0964053
commit 7171f32dc5
10 changed files with 317 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/login_form.php
View File

@@ -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>

4
include/version.php
View File

@@ -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 {