Commit 1ad4f2e6 authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge "Correct spelling of "occurred" (Bug #1034726)"

parents e3ff8d0d 16d4c5ba
......@@ -118,7 +118,7 @@ class Client {
}
}
catch (CryptException $e) {
throw new XmlrpcClientException("An error occured while decrypting a message sent by $wwwroot. Unable to authenticate the user.");
throw new XmlrpcClientException("An error occurred while decrypting a message sent by $wwwroot. Unable to authenticate the user.");
}
if ($xml->getName() == 'methodResponse') {
......@@ -170,7 +170,7 @@ class Client {
throw new XmlrpcClientException('Remote site claims to have sent a public key, but they LIE');
}
}
throw new XmlrpcClientException('Unknown error occured: ' . $this->response['faultCode'] . ': ' . $this->response['faultString']);
throw new XmlrpcClientException('Unknown error occurred: ' . $this->response['faultCode'] . ': ' . $this->response['faultString']);
}
// Clean up so object can be re-used.
......
......@@ -513,7 +513,7 @@ class AuthXmlrpc extends Auth {
->send($this->wwwroot);
}
catch (XmlrpcClientException $e) {
log_debug("XMLRPC error occured while calling MNET method kill_children on $this->wwwroot");
log_debug("XMLRPC error occurred while calling MNET method kill_children on $this->wwwroot");
log_debug("This means that single-signout probably didn't work properly, but the problem "
. "is at the remote application");
log_debug("If the remote application is Moodle, you are likely a victim of "
......
......@@ -238,7 +238,7 @@ function import_process_queue() {
$processed[] = $item->id;
}
catch (Exception $e) {
log_debug('an error occured on import: ' . $e->getMessage());
log_debug('an error occurred on import: ' . $e->getMessage());
$importer->get('importertransport')->cleanup();
}
}
......
......@@ -652,7 +652,7 @@ $string['suspenduser'] = 'Suspend user';
$string['suspendeduserstitle'] = 'Suspended and expired users';
$string['suspendedusers'] = 'Suspended users';
$string['suspensionreason'] = 'Suspension reason';
$string['errorwhilesuspending'] = 'An error occured while trying to suspend';
$string['errorwhilesuspending'] = 'An error occurred while trying to suspend';
$string['suspendedusersdescription'] = 'Suspend or reactivate users from using the site';
$string['unsuspendusers'] = 'Unsuspend users';
$string['usersdeletedsuccessfully'] = 'users deleted successfully';
......@@ -845,7 +845,7 @@ $string['userstoberemoved'] = 'Users to be removed';
$string['removeusers'] = 'Remove users';
$string['declinerequests'] = 'Decline requests';
$string['nousersupdated'] = 'No users were updated';
$string['errorupdatinginstitutionusers'] = 'An error occured when updating institution users';
$string['errorupdatinginstitutionusers'] = 'An error occurred when updating institution users';
$string['revokeinvitations'] = 'Revoke invitations';
$string['invitedusers'] = 'Invited users';
$string['userstobeuninvited'] = 'Users to be uninvited';
......@@ -900,7 +900,7 @@ $string['registrationreason'] = 'Registration reason';
$string['makeuserinstitutionstaff'] = 'Automatically assign institution staff permissions to the owner of this email the first time they log in';
// Suspend Institutions
$string['errorwhileunsuspending'] = 'An error occured while trying to unsuspend';
$string['errorwhileunsuspending'] = 'An error occurred while trying to unsuspend';
$string['institutionsuspended'] = 'Institution suspended';
$string['institutionunsuspended'] = 'Institution unsuspended';
$string['suspendedinstitution'] = 'SUSPENDED';
......
......@@ -677,7 +677,7 @@ function get_records_sql_array($sql,$values, $limitfrom='', $limitnum='') {
* Utility function used by the following 3 methods.
*
* @param object $rs an ADODB RecordSet object with two columns.
* @return mixed an associative array, or false if an error occured or the RecordSet was empty.
* @return mixed an associative array, or false if an error occurred or the RecordSet was empty.
* @access private
*/
function recordset_to_menu($rs) {
......@@ -717,7 +717,7 @@ function recordset_to_menu($rs) {
* @param string $value the value the field must have (requred if field1 is given, else optional).
* @param string $sort an order to sort the results in (optional, a valid SQL ORDER BY parameter).
* @param string $fields a comma separated list of fields to return (optional, by default all fields are returned).
* @return mixed an associative array, or false if no records were found or an error occured.
* @return mixed an associative array, or false if no records were found or an error occurred.
*/
function get_records_menu($table, $field='', $value='', $sort='', $fields='*') {
$rs = get_recordset($table, $field, $value, $sort, $fields);
......@@ -735,7 +735,7 @@ function get_records_menu($table, $field='', $value='', $sort='', $fields='*') {
* @param array $values When using prepared statements, this is the value array (optional).
* @param string $sort Sort order (optional) - a valid SQL order parameter
* @param string $fields A comma separated list of fields to be returned from the chosen table.
* @return mixed an associative array, or false if no records were found or an error occured.
* @return mixed an associative array, or false if no records were found or an error occurred.
*/
function get_records_select_menu($table, $select='', $values=null, $sort='', $fields='*') {
$rs = get_recordset_select($table, $select, $values, $sort, $fields);
......
......@@ -130,8 +130,8 @@ function log_environ ($message, $escape=true, $backtrace=true) {
* @param bool $escape Whether to HTML escape the message
* @param bool $backtrace Whether to provide a backtrace if the system is
* configured to give backtraces at this level.
* @param string $file The file the error occured in
* @param int $line The line number the error occured on
* @param string $file The file the error occurred in
* @param int $line The line number the error occurred on
* @param array $trace The backtrace for the error
* @access private
*/
......@@ -515,7 +515,7 @@ class MaharaException extends Exception {
return $strings[$tag];
}
return 'An error occured';
return 'An error occurred';
}
public function get_sitename() {
......@@ -662,7 +662,7 @@ class SystemException extends MaharaException implements MaharaThrowable {
public function strings() {
return array_merge(parent::strings(),
array('message' => 'A nonrecoverable error occured. '
array('message' => 'A nonrecoverable error occurred. '
. 'This probably means you have encountered a bug in the system'));
}
......@@ -734,7 +734,7 @@ class ConfigSanityException extends ConfigException {
}
/**
* An SQL related error occured
* An SQL related error occurred
*/
class SQLException extends SystemException {
public function __construct($message=null, $code=0) {
......
......@@ -940,7 +940,7 @@ EOF;
* Marks a field has having an error.
*
* This method should be used to set an error on an element in a custom
* validation function, if one has occured.
* validation function, if one has occurred.
*
* @param string $name The name of the element to set an error on
* @param string $message The error message
......
......@@ -382,7 +382,7 @@ function get_clam_error_code($returncode) {
$returncodes = array();
$returncodes[0] = 'No virus found.';
$returncodes[1] = 'Virus(es) found.';
$returncodes[2] = ' An error occured'; // specific to clamdscan
$returncodes[2] = ' An error occurred'; // specific to clamdscan
// all after here are specific to clamscan
$returncodes[40] = 'Unknown option passed.';
$returncodes[50] = 'Database initialization error.';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment