Skip to content

Commit

Permalink
Merge branch 'patch/php7.2-compatibility'
Browse files Browse the repository at this point in the history
  • Loading branch information
croxton committed Jan 11, 2019
2 parents b89a6cd + 589f1a7 commit 6dd5681
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Stash

![Release](https://img.shields.io/badge/release-3.0.6-brightgreen.svg)
![Release](https://img.shields.io/badge/release-3.0.8-brightgreen.svg)

Stash for ExpressionEngine 3 and 4.

Expand Down
2 changes: 1 addition & 1 deletion system/user/addons/stash/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
if (! defined('STASH_VER'))
{
define('STASH_NAME', 'Stash');
define('STASH_VER', '3.0.6');
define('STASH_VER', '3.0.8');
define('STASH_AUTHOR', 'Mark Croxton, Hallmark Design');
define('STASH_AUTHOR_URL', 'http://hallmark-design.co.uk');
define('STASH_DOCS', 'http://github.com/croxton/Stash/');
Expand Down
12 changes: 6 additions & 6 deletions system/user/addons/stash/mod.stash.php
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ public function set($params=array(), $value='', $type='variable', $scope='user')

if ( !! $name)
{
if ($context !== NULL && count( explode(':', $name) == 1 ) )
if ($context !== NULL && count( explode(':', $name)) == 1 )
{
$name = $context . ':' . $name;
ee()->TMPL->tagparams['context'] = NULL;
Expand Down Expand Up @@ -848,7 +848,7 @@ public function get($params='', $type='variable', $scope='user')
$context = ee()->TMPL->fetch_param('context', NULL);
$global_name = $name;

if ($context !== NULL && count( explode(':', $name) == 1 ) )
if ($context !== NULL && count( explode(':', $name)) == 1 )
{
$name = $context . ':' . $name;
ee()->TMPL->tagparams['context'] = NULL;
Expand Down Expand Up @@ -1518,7 +1518,7 @@ public function set_list()

if ( !! $name)
{
if ($context !== NULL && count( explode(':', $name) == 1 ) )
if ($context !== NULL && count( explode(':', $name)) == 1 )
{
$name = $context . ':' . $name;
}
Expand Down Expand Up @@ -1728,7 +1728,7 @@ private function _update_list($append=TRUE)
if ( $this->not_empty(ee()->TMPL->tagdata))
{
// does the list really exist?
if ($context !== NULL && count( explode(':', $name) == 1 ) )
if ($context !== NULL && count( explode(':', $name)) == 1 )
{
$name = $context . ':' . $name;
}
Expand Down Expand Up @@ -2249,7 +2249,7 @@ public function get_bundle($set=TRUE)

// get bundle var
$bundle_entry_key = $bundle;
if ($bundle !== NULL && count( explode(':', $bundle) == 1 ) )
if ($bundle !== NULL && count( explode(':', $bundle)) == 1 )
{
$bundle_entry_key = $context . ':' . $bundle;
}
Expand Down Expand Up @@ -3179,7 +3179,7 @@ public function destroy($params=array(), $type='variable', $scope='user')
else
{
// a named variable
if ($context !== NULL && count( explode(':', $name) == 1 ))
if ($context !== NULL && count( explode(':', $name)) == 1 )
{
$name = $context . ':' . $name;
}
Expand Down

0 comments on commit 6dd5681

Please sign in to comment.