Skip to content

Commit

Permalink
Merge branch 'hotfix/1.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
abrain committed Jul 1, 2018
2 parents 3a4663a + dcf491a commit d960ece
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/einsatzverwaltung-core.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
*/
class Core
{
const VERSION = '1.4.0';
const VERSION = '1.4.1';
const DB_VERSION = 30;

/**
Expand Down
3 changes: 2 additions & 1 deletion src/einsatzverwaltung-frontend.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,11 @@ private function addHooks()
array_key_exists('plugin', $_REQUEST) && $_REQUEST['plugin'] == 'all-in-one-event-calendar' &&
array_key_exists('action', $_REQUEST) && $_REQUEST['action'] == 'export_events'
)) {
add_filter('the_content', array($this, 'renderContent'));
add_filter('the_content', array($this, 'renderContent'), 9);
}
add_filter('the_excerpt', array($this, 'filterEinsatzExcerpt'));
add_filter('the_excerpt_rss', array($this, 'filterEinsatzExcerpt'));
add_filter('the_excerpt_embed', array($this, 'filterEinsatzExcerpt'));
add_action('pre_get_posts', array($this, 'addReportsToQuery'));
}

Expand Down
2 changes: 1 addition & 1 deletion src/einsatzverwaltung.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Plugin Name: Einsatzverwaltung
Plugin URI: https://einsatzverwaltung.abrain.de
Description: Verwaltung und Darstellung von Einsatzberichten der Feuerwehr und anderer Hilfsorganisationen
Version: 1.4.0
Version: 1.4.1
Author: Andreas Brain
Author URI: https://www.abrain.de
License: GPLv2
Expand Down
6 changes: 5 additions & 1 deletion src/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Tags: Feuerwehr, Hilfsorganisation, Öffentlichkeitsarbeit
Requires at least: 4.6.0
Tested up to: 4.9
Requires PHP: 5.3.0
Stable tag: 1.4.0
Stable tag: 1.4.1
License: GPLv2
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -72,6 +72,10 @@ Nein, mehr gibt es [hier](https://einsatzverwaltung.abrain.de/faq/).

== Changelog ==

= 1.4.1 =
* Absätze wurden bei der Verwendung von Templates nicht richtig dargestellt
* Einstellungen für Auszüge gelten jetzt auch für oEmbeds

= 1.4.0 =
* Gestaltung von Einsatzberichten und Auszügen mit Hilfe von Templates
* Export von Einsatzberichten in den Formaten CSV und JSON (Dank an [Heiko](https://github.com/heikobornholdt/))
Expand Down

0 comments on commit d960ece

Please sign in to comment.