diff options
| -rw-r--r-- | functions.php | 4 | ||||
| -rw-r--r-- | lib/magpierss/AUTHORS (renamed from magpierss/AUTHORS) | 0 | ||||
| -rw-r--r-- | lib/magpierss/README (renamed from magpierss/README) | 0 | ||||
| -rw-r--r-- | lib/magpierss/extlib/Snoopy.class.inc (renamed from magpierss/extlib/Snoopy.class.inc) | 0 | ||||
| -rw-r--r-- | lib/magpierss/rss_cache.inc (renamed from magpierss/rss_cache.inc) | 0 | ||||
| -rw-r--r-- | lib/magpierss/rss_fetch.inc (renamed from magpierss/rss_fetch.inc) | 0 | ||||
| -rw-r--r-- | lib/magpierss/rss_parse.inc (renamed from magpierss/rss_parse.inc) | 0 | ||||
| -rw-r--r-- | lib/magpierss/rss_utils.inc (renamed from magpierss/rss_utils.inc) | 0 | ||||
| -rw-r--r-- | update_daemon.php | 3 | ||||
| -rw-r--r-- | update_daemon2.php | 2 | ||||
| -rw-r--r-- | update_daemon_loop.php | 2 |
11 files changed, 4 insertions, 7 deletions
diff --git a/functions.php b/functions.php index f9ae442c5..8f207cbdd 100644 --- a/functions.php +++ b/functions.php @@ -103,8 +103,8 @@ define('MAGPIE_CACHE_AGE', 60*15); // 15 minutes require_once "lib/simplepie/simplepie.inc"; - require_once "magpierss/rss_fetch.inc"; - require_once 'magpierss/rss_utils.inc'; + require_once "lib/magpierss/rss_fetch.inc"; + require_once 'lib/magpierss/rss_utils.inc'; /** * Print a timestamped debug message. diff --git a/magpierss/AUTHORS b/lib/magpierss/AUTHORS index 7d7f3f53e..7d7f3f53e 100644 --- a/magpierss/AUTHORS +++ b/lib/magpierss/AUTHORS diff --git a/magpierss/README b/lib/magpierss/README index 6af7edb07..6af7edb07 100644 --- a/magpierss/README +++ b/lib/magpierss/README diff --git a/magpierss/extlib/Snoopy.class.inc b/lib/magpierss/extlib/Snoopy.class.inc index 17e6a952d..17e6a952d 100644 --- a/magpierss/extlib/Snoopy.class.inc +++ b/lib/magpierss/extlib/Snoopy.class.inc diff --git a/magpierss/rss_cache.inc b/lib/magpierss/rss_cache.inc index b8d436cdd..b8d436cdd 100644 --- a/magpierss/rss_cache.inc +++ b/lib/magpierss/rss_cache.inc diff --git a/magpierss/rss_fetch.inc b/lib/magpierss/rss_fetch.inc index 695d3b69e..695d3b69e 100644 --- a/magpierss/rss_fetch.inc +++ b/lib/magpierss/rss_fetch.inc diff --git a/magpierss/rss_parse.inc b/lib/magpierss/rss_parse.inc index 011048310..011048310 100644 --- a/magpierss/rss_parse.inc +++ b/lib/magpierss/rss_parse.inc diff --git a/magpierss/rss_utils.inc b/lib/magpierss/rss_utils.inc index 86fbdc829..86fbdc829 100644 --- a/magpierss/rss_utils.inc +++ b/lib/magpierss/rss_utils.inc diff --git a/update_daemon.php b/update_daemon.php index 35177edd6..b2bae956e 100644 --- a/update_daemon.php +++ b/update_daemon.php @@ -8,8 +8,6 @@ declare(ticks = 1); - define('MAGPIE_CACHE_DIR', '/var/tmp/magpie-ttrss-cache-daemon'); - define('SIMPLEPIE_CACHE_DIR', '/var/tmp/simplepie-ttrss-cache-daemon'); define('DISABLE_SESSIONS', true); require_once "version.php"; @@ -34,7 +32,6 @@ require_once "db.php"; require_once "db-prefs.php"; require_once "functions.php"; - require_once "magpierss/rss_fetch.inc"; error_reporting(DEFAULT_ERROR_LEVEL); diff --git a/update_daemon2.php b/update_daemon2.php index 777b835ab..a8eb48d4c 100644 --- a/update_daemon2.php +++ b/update_daemon2.php @@ -34,7 +34,7 @@ require_once "db.php"; require_once "db-prefs.php"; require_once "functions.php"; - require_once "magpierss/rss_fetch.inc"; + require_once "lib/magpierss/rss_fetch.inc"; error_reporting(DEFAULT_ERROR_LEVEL); diff --git a/update_daemon_loop.php b/update_daemon_loop.php index 56b3839a2..064a904d3 100644 --- a/update_daemon_loop.php +++ b/update_daemon_loop.php @@ -34,7 +34,7 @@ require_once "db.php"; require_once "db-prefs.php"; require_once "functions.php"; - require_once "magpierss/rss_fetch.inc"; + require_once "lib/magpierss/rss_fetch.inc"; error_reporting(DEFAULT_ERROR_LEVEL); |