Skip to content

Commit

Permalink
Merge branch 'hotfix/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sommerregen committed Jan 22, 2015
2 parents b76f9c9 + 7ced030 commit f81391c
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
12 changes: 9 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# v1.0.1
## 01/22/2015

1. [](#bugfix)
* Fixed issue with ignored `enabled: false` option

# v1.0.0
## 01/19/2015

Expand All @@ -8,11 +14,11 @@
* Added more configuration options to Admin Panel

3. [](#improved)
* Automatically add taxonomy type (`archive`) for months and years
* Automatically add taxonomy type (`archive`) for months and years

1. [](#new)
4. [](#new)
* Added a blogger like hierarchical (year/month/post) archive menu

2. [](#new)
5. [](#new)
* Fork of *Archives* plugin v1.2.0 by _Grav Team_ (see https://github.com/getgrav/grav-plugin-archives)
* ChangeLog started...
15 changes: 9 additions & 6 deletions archive_plus.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php
/**
* Archive Plus 1.0
* Archive Plus 1.0.1
*
* An enhanced version of the Grav Archives plugin with more
* configuration options and the ability to show a blogger-like
Expand All @@ -9,7 +9,7 @@
* Licensed under MIT, see LICENSE.
*
* @package Archive Plus
* @version 1.0
* @version 1.0.1
* @link <https://github.com/sommerregen/grav-plugin-archive-plus>
* @author Benjamin Regler <[email protected]>
* @copyright 2015, Benjamin Regler
Expand Down Expand Up @@ -62,12 +62,15 @@ public function onPluginsInitialized() {
return;
}

if ( $this->config->get('plugins.archive_plus.enabled') ) {
// Emulate Archives plugin; switch it off, if present
$this->config->set('plugins.archives.enabled', FALSE);
$this->config->set('plugins.archives.emulated', TRUE);
// Activate plugin only if 'enabled' option is set true
if ( !$this->config->get('plugins.archive_plus.enabled') ) {
return;
}

// Emulate Archives plugin; switch it off, if present
$this->config->set('plugins.archives.enabled', FALSE);
$this->config->set('plugins.archives.emulated', TRUE);

// Dynamically add the needed taxonomy types to the taxonomies config
$taxonomy_config = array_merge((array)
$this->config->get('site.taxonomies'), ['archive']);
Expand Down
4 changes: 2 additions & 2 deletions blueprints.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Archive Plus
version: 1.0.0
version: 1.0.1
description: "The **Archive Plus** plugin is an enhanced version of the [Grav Archives plugin](https://github.com/getgrav/grav-plugin-archives) with more configuration options and the ability to show a blogger like hierarchical archive menu for links grouped by month and/or year."
icon: university
author:
name: Benjamin Regler
name: Sommerregen
email: [email protected]
homepage: https://github.com/sommerregen/grav-plugin-archive-plus
docs: https://github.com/sommerregen/grav-plugin-archive-plus/blob/master/README.md
Expand Down

0 comments on commit f81391c

Please sign in to comment.