Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

This commit is contained in:
Andrew Dolgov 2013-07-13 22:15:42 +04:00
commit e8463701db
4 changed files with 488 additions and 1965 deletions

View File

@ -18,9 +18,9 @@
// *** Basic settings (important!) *** // *** Basic settings (important!) ***
// *********************************** // ***********************************
define('SELF_URL_PATH', 'http://yourserver/tt-rss/'); define('SELF_URL_PATH', 'http://example.org/tt-rss/');
// Full URL of your tt-rss installation. This should be set to the // Full URL of your tt-rss installation. This should be set to the
// location of tt-rss directory, e.g. http://yourserver/tt-rss/ // location of tt-rss directory, e.g. http://example.org/tt-rss/
// You need to set this option correctly otherwise several features // You need to set this option correctly otherwise several features
// including PUSH, bookmarklets and browser integration will not work properly. // including PUSH, bookmarklets and browser integration will not work properly.

View File

@ -95,7 +95,7 @@
} }
} }
if (SELF_URL_PATH == "http://yourserver/tt-rss/") { if (SELF_URL_PATH == "http://example.org/tt-rss/") {
$urlpath = preg_replace("/\w+\.php$/", "", make_self_url_path()); $urlpath = preg_replace("/\w+\.php$/", "", make_self_url_path());
array_push($errors, array_push($errors,

Binary file not shown.

File diff suppressed because it is too large Load Diff