/**
* Return the requested URL and point to file and line number from which the
- * exception occured
+ * exception occurred
*
* @return string
*/
*/
public static function setResult( $result, $feed, $feedItems ) {
// Store output in the Result data.
- // This way we can check during execution if any error has occured
+ // This way we can check during execution if any error has occurred
// Disable size checking for this because we can't continue
// cleanly; size checking would cause more problems than it'd
// solve
}
$feed->outFooter();
} else {
- // Error has occured, print something useful
+ // Error has occurred, print something useful
ApiBase::dieDebug( __METHOD__, 'Invalid feed class/item' );
}
}
// Reset and print just the error message
ob_clean();
- // If the error occured during printing, do a printer->profileOut()
+ // If the error occurred during printing, do a printer->profileOut()
$this->mPrinter->safeProfileOut();
$this->printResult( true );
}
*
* @par Return value:
*
- * This returns a Status, which contains all warnings and fatals that occured
+ * This returns a Status, which contains all warnings and fatals that occurred
* during the operation. The 'failCount', 'successCount', and 'success' members
* will reflect each operation attempted.
*
* The status will be "OK" unless:
* - a) unexpected operation errors occurred (network partitions, disk full...)
- * - b) significant operation errors occured and 'force' was not set
+ * - b) significant operation errors occurred and 'force' was not set
*
* @param $ops Array List of operations to execute in order
* @param $opts Array Batch operation options
* - bypassReadOnly : Allow writes in read-only mode (since 1.20)
*
* @par Return value:
- * This returns a Status, which contains all warnings and fatals that occured
+ * This returns a Status, which contains all warnings and fatals that occurred
* during the operation. The 'failCount', 'successCount', and 'success' members
* will reflect each operation attempted for the given files. The status will be
- * considered "OK" as long as no fatal errors occured.
+ * considered "OK" as long as no fatal errors occurred.
*
* @param $ops Array Set of operations to execute
* @param $opts Array Batch operation options
*
* The resulting Status will be "OK" unless:
* - a) unexpected operation errors occurred (network partitions, disk full...)
- * - b) significant operation errors occured and 'force' was not set
+ * - b) significant operation errors occurred and 'force' was not set
*
* @param $performOps Array List of FileOp operations
* @param $opts Array Batch operation options
$up = DatabaseUpdater::newForDB( $this->db );
$up->doUpdates();
} catch ( MWException $e ) {
- echo "\nAn error occured:\n";
+ echo "\nAn error occurred:\n";
echo $e->getText();
$ret = false;
}
* @param $image File File associated with this thumbnail
* @param $params array Array with scaler params
*
- * @return MediaTransformError Error object if error occured, false (=no error) otherwise
+ * @return MediaTransformError Error object if error occurred, false (=no error) otherwise
*/
protected function transformImageMagick( $image, $params ) {
# use ImageMagick
* @param $image File File associated with this thumbnail
* @param $params array Array with scaler params
*
- * @return MediaTransformError Error object if error occured, false (=no error) otherwise
+ * @return MediaTransformError Error object if error occurred, false (=no error) otherwise
*/
protected function transformImageMagickExt( $image, $params ) {
global $wgSharpenReductionThreshold, $wgSharpenParameter, $wgMaxAnimatedGifArea;
* @param $image File File associated with this thumbnail
* @param $params array Array with scaler params
*
- * @return MediaTransformError Error object if error occured, false (=no error) otherwise
+ * @return MediaTransformError Error object if error occurred, false (=no error) otherwise
*/
protected function transformCustom( $image, $params ) {
# Use a custom convert command
}
/**
- * Log an error that occured in an external process
+ * Log an error that occurred in an external process
*
* @param $retval int
* @param $err int
* @param $image File File associated with this thumbnail
* @param $params array Array with scaler params
*
- * @return MediaTransformError Error object if error occured, false (=no error) otherwise
+ * @return MediaTransformError Error object if error occurred, false (=no error) otherwise
*/
protected function transformGd( $image, $params ) {
# Use PHP's builtin GD library functions.
'hookaborted' => 'The modification you tried to make was aborted by an extension.',
'illegal-filename' => 'The filename is not allowed.',
'overwrite' => 'Overwriting an existing file is not allowed.',
-'unknown-error' => 'An unknown error occured.',
+'unknown-error' => 'An unknown error occurred.',
'tmp-create-error' => 'Could not create temporary file.',
'tmp-write-error' => 'Error writing temporary file.',
'large-file' => 'It is recommended that files are no larger than $1;
If the problem persists, contact an [[Special:ListUsers/sysop|administrator]].',
'upload-too-many-redirects' => 'The URL contained too many redirects',
'upload-unknown-size' => 'Unknown size',
-'upload-http-error' => 'An HTTP error occured: $1',
+'upload-http-error' => 'An HTTP error occurred: $1',
'upload-copy-upload-invalid-domain' => 'Copy uploads are not available from this domain.',
# File backend
dépôts / lhc / web / wiklou.git / commitdiff