Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbalogh@mozilla.com <jbalogh@mozilla.com@4eb1ac78-321c-0410-a911-ec516a8615a5>2009-03-18 20:24:26 (GMT)
committer jbalogh@mozilla.com <jbalogh@mozilla.com@4eb1ac78-321c-0410-a911-ec516a8615a5>2009-03-18 20:24:26 (GMT)
commitacc8592c4944c9206df714e5df1b13aa932b0a44 (patch)
treea44f60abe83e8b45f754f0d6c340baa0884f4f72
parent3e6a35a2edd038a8964f5ea5ba889f15147a68b7 (diff)
bug 478965, fixing usage of a deprecated SimpleTest API
git-svn-id: http://svn.mozilla.org/addons/trunk@23504 4eb1ac78-321c-0410-a911-ec516a8615a5
-rw-r--r--site/app/controllers/users_controller.php2
-rw-r--r--site/app/tests/test_helper_unit.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/site/app/controllers/users_controller.php b/site/app/controllers/users_controller.php
index 91f8fbc..0671eff 100644
--- a/site/app/controllers/users_controller.php
+++ b/site/app/controllers/users_controller.php
@@ -131,7 +131,7 @@ class UsersController extends AppController
$this->User->invalidate('nickname');
}
- // any errors? Get our of here.
+ // any errors? Get out of here.
if (!$this->User->save()) {
$this->publish('errorMessage', true);
$this->render();
diff --git a/site/app/tests/test_helper_unit.php b/site/app/tests/test_helper_unit.php
index 49903a5..f88f691 100644
--- a/site/app/tests/test_helper_unit.php
+++ b/site/app/tests/test_helper_unit.php
@@ -193,7 +193,7 @@ class UnitTestHelper
* Since there is nothing we can do to prevent those, we are going to filter them
* out and add the $realErrors back into the queue later on.
*/
- $queue = &SimpleErrorQueue::instance();
+ $queue = &SimpleTest::getContext()->get('SimpleErrorQueue');
$realErrors = array();
while ($error = $queue->extract())