summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-02-11 22:08:20 -0800
committerZach Copley <zach@controlyourself.ca>2009-02-11 22:08:20 -0800
commit616bdd43a921b2554d21b80af28ddb0fb6cb3c16 (patch)
tree0a48aecc1bc5d92582f7858ca2649f2f1e90aa78 /actions
parent9f035e2847e0d119ca3d70e02df6f4fa73ca64c3 (diff)
Just discovered the PEAR_Error handling function in index.php. Duh.
Renamed the Action functions to throw an exception like it. I still think it probably makes sense to have the callback defined in both places for finer control.
Diffstat (limited to 'actions')
-rw-r--r--actions/emailsettings.php6
-rw-r--r--actions/register.php6
2 files changed, 6 insertions, 6 deletions
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index c6c983453..0a86aa66d 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -489,7 +489,7 @@ class EmailsettingsAction extends AccountSettingsAction
}
/**
- * Check old fashioned PEAR_Error msgs coming from DB_DataObject
+ * Handle old fashioned PEAR_Error msgs coming from DB_DataObject
*
* In this case email don't exist in the DB yet, so DB_DataObject
* throws an error. Overrided from Action.
@@ -499,13 +499,13 @@ class EmailsettingsAction extends AccountSettingsAction
* @return nothing
*/
- function checkDB_DataObjectError($error) {
+ function handleError($error) {
if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
// Do nothing.
} else {
- parent::checkDB_DataObjectError($error);
+ parent::handleError($error);
}
}
diff --git a/actions/register.php b/actions/register.php
index 853bd0cf6..aafb54ebb 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -229,7 +229,7 @@ class RegisterAction extends Action
}
/**
- * Check old fashioned PEAR_Error msgs coming from DB_DataObject
+ * Handle old fashioned PEAR_Error msgs coming from DB_DataObject
*
* In this case nickname and email don't exist in the DB yet,
* so DB_DataObject throws an error. Overrided from Action.
@@ -239,13 +239,13 @@ class RegisterAction extends Action
* @return nothing
*/
- function checkDB_DataObjectError($error) {
+ function handleError($error) {
if ($error->getCode() == DB_DATAOBJECT_ERROR_NODATA) {
// Do nothing.
} else {
- parent::checkDB_DataObjectError($error);
+ parent::handleError($error);
}
}