Skip to content

Commit

Permalink
Merge branch 'bugfix/cache-refresh-broken'
Browse files Browse the repository at this point in the history
  • Loading branch information
ben-xo committed Mar 17, 2021
2 parents 88f7073 + 6a6c653 commit 222d839
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
strategy:
matrix:
operating-system: [ubuntu-latest]
php-versions: ['7.3', 7.4', '8.0']
php-versions: ['7.3', '7.4', '8.0']
runs-on: ${{ matrix.operating-system }}
steps:
- name: Setup PHP and extensions
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
Changelog
=========

1.30 2021-03-17 * Fix nasty bug when refreshing podcasts due to a newly
uploaded file removing all the links and replacing them
with file paths.

* Compatibility fix with PHP 5.3

1.29 2021-03-01 * Proper fix for Last-modified header to use the date within
the cached podcast.

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![Testing dir2cast](https://github.com/ben-xo/dir2cast/actions/workflows/testing.yml/badge.svg)](https://github.com/ben-xo/dir2cast/actions/workflows/testing.yml)

dir2cast by Ben XO v1.29 (2021-03-01)
dir2cast by Ben XO v1.30 (2021-03-17)
================================================================================

https://github.com/ben-xo/dir2cast/
Expand Down
14 changes: 7 additions & 7 deletions dir2cast.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
/* DEFAULTS *********************************************/

// error handler needs these, so let's set them now.
define('VERSION', '1.29');
define('VERSION', '1.30');
define('DIR2CAST_HOMEPAGE', 'https://github.com/ben-xo/dir2cast/');
define('GENERATOR', 'dir2cast ' . VERSION . ' by Ben XO (' . DIR2CAST_HOMEPAGE . ')');

Expand Down Expand Up @@ -1797,6 +1797,12 @@ public static function defaults()
Dir_Podcast::$MIN_FILE_AGE = MIN_FILE_AGE;
Cached_Dir_Podcast::$MIN_CACHE_TIME = MIN_CACHE_TIME;
getID3_Podcast_Helper::$AUTO_SAVE_COVER_ART = AUTO_SAVE_COVER_ART;

// Set up up factory settings for RSS Items
RSS_File_Item::$FILES_URL = MP3_URL; // TODO: rename this to MEDIA_URL
RSS_File_Item::$FILES_DIR = MP3_DIR; // TODO: rename this to MEDIA_DIR
Media_RSS_Item::$LONG_TITLES = LONG_TITLES;
Media_RSS_Item::$DESCRIPTION_SOURCE = DESCRIPTION_SOURCE;
}

public static function load_from_ini($file)
Expand Down Expand Up @@ -1874,12 +1880,6 @@ public function init()
$atom = $podcast->addHelper(new Atom_Podcast_Helper());
$itunes = $podcast->addHelper(new iTunes_Podcast_Helper());

// Set up up factory settings for RSS Items
RSS_File_Item::$FILES_URL = MP3_URL; // TODO: rename this to MEDIA_URL
RSS_File_Item::$FILES_DIR = MP3_DIR; // TODO: rename this to MEDIA_DIR
Media_RSS_Item::$LONG_TITLES = LONG_TITLES;
Media_RSS_Item::$DESCRIPTION_SOURCE = DESCRIPTION_SOURCE;

$podcast->setTitle(TITLE);
$podcast->setLink(LINK);
$podcast->setDescription(DESCRIPTION);
Expand Down

0 comments on commit 222d839

Please sign in to comment.