Merge branch 'ee3' of github.com:croxton/Stash into ee3

croxton · croxton · commit 19a662bea3bf · 2016-04-15T16:33:33.000+01:00
diff --git a/system/user/addons/stash/mod.stash.php b/system/user/addons/stash/mod.stash.php
@@ -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)) 
         {
@@ -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 */

Original file line number	Diff line number	Diff line change
`@@ -3260,7 +3260,7 @@ public function flush_cache()`
`3260`	`3260`	`private function _matches($match, $against)`
`3261`	`3261`	`{`
`3262`	`3262`	`$is_match = TRUE;`
`3263`		`- $match = ee()->security->entity_decode($match);`
	`3263`	`+ $match = ee('Security/XSS')->entity_decode($match);`
`3264`	`3264`
`3265`	`3265`	`if ( ! is_array($against))`
`3266`	`3266`	`{`
`@@ -5164,4 +5164,4 @@ private function _get_users_vars()`
`5164`	`5164`	`}`
`5165`	`5165`
`5166`	`5166`	`/* End of file mod.stash.php */`
`5167`		`-/* Location: ./system/expressionengine/third_party/stash/mod.stash.php */`
	`5167`	`+/* Location: ./system/expressionengine/third_party/stash/mod.stash.php */`