Merge branch 'release-2.2' into develop

* release-2.2: Bump version for 2.2.5-pl [modxcms#8753] fixing that trivial variable error. Conflicts: _build/build.sample.properties _build/build.xml core/docs/changelog.txt core/docs/version.inc.php
danyaPostfactum · Oct 2, 2012 · e0ff51e · e0ff51e
2 parents 0e0daa3 + 2049ae5
commit e0ff51e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/docs/changelog.txt b/core/docs/changelog.txt
@@ -6,6 +6,9 @@ development release, and is only shown to give an idea of what's currently in th
 - Allow Namespace-based loading of custom TV files
 - Deprecate usage of modAction objects in favor of modNamespace base controller path
 
+MODX Revolution 2.2.5-pl (October 2, 2012)
+====================================
+- [#8753] Fix variable name in security/user/removemultiple processor
 - [#7654] Fix Update processor for ResourceGroup-restricted TVs
 - [#8196] Enable save button when combo selections are made
 - [#8186] Apply FC rules to Resources when changing Template

diff --git a/core/model/modx/processors/security/user/removemultiple.php b/core/model/modx/processors/security/user/removemultiple.php
@@ -20,7 +20,7 @@
 ));
 $canRemove = $this->processEventResponse($OnBeforeUserFormDelete);
 if (!empty($canRemove)) {
-    return $modx->error->failure($canSave);
+    return $modx->error->failure($canRemove);
 }
 
 /* loop through ids */