diff --git a/README.md b/README.md index bfeba02..7ed8062 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,22 @@ ## Stash -![Release](https://img.shields.io/badge/release-3.0.9-brightgreen.svg) +![Release](https://img.shields.io/badge/release-3.1.0-brightgreen.svg) -Stash for ExpressionEngine 3 and 4. +Stash for ExpressionEngine 3.0 to 6.0+. -* Author: [Mark Croxton](http://hallmark-design.co.uk/) +* Author: [Mark Croxton](https://hallmark-design.co.uk/) * Requires: ExpressionEngine 3.0+ ### Description -Stash allows you to stash text and snippets of code for reuse throughout your templates. Variables can be set dynamically from the $_GET or $_POST superglobals and can optionally be cached in the database for persistence across pages. - -Stash variables that you create are available to templates embedded below the level at which you are using the tag, or later in the parse order of the current template. - -Stash is inspired by John D Wells' article on [template partials](http://johndwells.com/blog/homegrown-plugin-to-create-template-partials-for-expressionengine), and Rob Sanchez's [Dynamo](https://github.com/rsanchez/dynamo) module. - +Stash allows you to stash text and snippets of code for reuse throughout your templates. Stash extends ExpressionEngine’s template parser with powerful features such as variables, lists, parse-order control, template partials, inheritance, layouts, caching and more. It will transform the way you think about and write templates. ### Documentation https://github.com/croxton/Stash/wiki/ +Copyright (c) 2021 Hallmark Design https://hallmark-design.co.uk + + diff --git a/composer.json b/composer.json index 7bc9290..052e11c 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,12 @@ { "name": "croxton/stash", "description": "Extended templating for ExpressionEngine", + "version": "3.1.0", "homepage": "https://github.com/croxton/Stash", + "support": { + "docs": "https://github.com/croxton/Stash/blob/master/README.md", + "issues": "https://github.com/croxton/Stash/issues" + }, "license": "GPL-3.0-or-later", "authors": [ { diff --git a/system/user/addons/stash/config.php b/system/user/addons/stash/config.php index 1832e58..488fa46 100755 --- a/system/user/addons/stash/config.php +++ b/system/user/addons/stash/config.php @@ -2,7 +2,7 @@ if (! defined('STASH_VER')) { define('STASH_NAME', 'Stash'); - define('STASH_VER', '3.0.9'); + define('STASH_VER', '3.1.0'); define('STASH_AUTHOR', 'Mark Croxton, Hallmark Design'); define('STASH_AUTHOR_URL', 'http://hallmark-design.co.uk'); define('STASH_DOCS', 'http://github.com/croxton/Stash/'); diff --git a/system/user/addons/stash/upd.stash.php b/system/user/addons/stash/upd.stash.php index 46442bd..776a388 100755 --- a/system/user/addons/stash/upd.stash.php +++ b/system/user/addons/stash/upd.stash.php @@ -111,7 +111,14 @@ public function uninstall() if ($query->row('module_id')) { - ee()->db->delete('module_member_groups', array('module_id' => $query->row('module_id'))); + if (version_compare(APP_VER, '6.0', '>=')) + { + ee()->db->delete('module_member_roles', array('module_id' => $query->row('module_id'))); + } + else + { + ee()->db->delete('module_member_groups', array('module_id' => $query->row('module_id'))); + } } ee()->db->delete('modules', array('module_name' => 'Stash'));