Skip to content

Commit

Permalink
Merge branch 'ee3' of github.com:croxton/Stash into ee3
Browse files Browse the repository at this point in the history
  • Loading branch information
croxton committed Apr 15, 2016
2 parents 0b17966 + 0266c3a commit 19a662b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions system/user/addons/stash/mod.stash.php
Original file line number Diff line number Diff line change
Expand Up @@ -3260,7 +3260,7 @@ public function flush_cache()
private function _matches($match, $against)
{
$is_match = TRUE;
$match = ee()->security->entity_decode($match);
$match = ee('Security/XSS')->entity_decode($match);

if ( ! is_array($against))
{
Expand Down Expand Up @@ -5164,4 +5164,4 @@ private function _get_users_vars()
}

/* End of file mod.stash.php */
/* Location: ./system/expressionengine/third_party/stash/mod.stash.php */
/* Location: ./system/expressionengine/third_party/stash/mod.stash.php */

0 comments on commit 19a662b

Please sign in to comment.