From: Ori Livneh Date: Tue, 23 Jun 2015 03:31:22 +0000 (-0700) Subject: ellapsed => elapsed X-Git-Tag: 1.31.0-rc.0~11011 X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=c099155a17d26f03799a9ba085d7b5b912b186e2;p=lhc%2Fweb%2Fwiklou.git ellapsed => elapsed Also fix some files that don't end with a newline. Change-Id: Id0672d685b929a5832b42f733dad49683536180a --- diff --git a/docs/linkcache.txt b/docs/linkcache.txt index 266f200d48..13b6961356 100644 --- a/docs/linkcache.txt +++ b/docs/linkcache.txt @@ -21,4 +21,4 @@ foreach( $pages as $page ){ } $batch = new LinkBatch( $titles ); -$batch->execute(); \ No newline at end of file +$batch->execute(); diff --git a/docs/sitelist.txt b/docs/sitelist.txt index 48c7ce522a..24e1b9a7f5 100644 --- a/docs/sitelist.txt +++ b/docs/sitelist.txt @@ -44,4 +44,4 @@ The XML elements are used as follows: ** link: Generic URL template, often the document root. ** page_path: (for mediawiki sites) URL template for wiki pages (corresponds to the target wiki's $wgArticlePath setting) ** file_path: (for mediawiki sites) URL pattern for application entry points and resources (corresponds to the target wiki's $wgScriptPath setting). -* forward: Whether using a prefix defined by a localid tag in the URL will cause the request to be redirected to the corresponding page on the target wiki (currently unused). E.g. whether http://wiki.acme.com/wiki/foo:Buzz should be forwarded to http://wiki.foo.com/read/Buzz. (CAVEAT: not yet implement, can be specified but has no effect) \ No newline at end of file +* forward: Whether using a prefix defined by a localid tag in the URL will cause the request to be redirected to the corresponding page on the target wiki (currently unused). E.g. whether http://wiki.acme.com/wiki/foo:Buzz should be forwarded to http://wiki.foo.com/read/Buzz. (CAVEAT: not yet implement, can be specified but has no effect) diff --git a/includes/htmlform/HTMLFormFieldWithButton.php b/includes/htmlform/HTMLFormFieldWithButton.php index 3c8910f843..113bb4b937 100644 --- a/includes/htmlform/HTMLFormFieldWithButton.php +++ b/includes/htmlform/HTMLFormFieldWithButton.php @@ -54,4 +54,4 @@ class HTMLFormFieldWithButton extends HTMLFormField { public function getElement( $element ) { return $element . ' ' . $this->getInputHTML( '' ); } -} \ No newline at end of file +} diff --git a/includes/htmlform/HTMLSelectNamespaceWithButton.php b/includes/htmlform/HTMLSelectNamespaceWithButton.php index 5ab57a335a..24b15bd700 100644 --- a/includes/htmlform/HTMLSelectNamespaceWithButton.php +++ b/includes/htmlform/HTMLSelectNamespaceWithButton.php @@ -14,4 +14,4 @@ class HTMLSelectNamespaceWithButton extends HTMLSelectNamespace { public function getInputHTML( $value ) { return $this->mClassWithButton->getElement( parent::getInputHTML( $value ) ); } -} \ No newline at end of file +} diff --git a/includes/htmlform/HTMLTextFieldWithButton.php b/includes/htmlform/HTMLTextFieldWithButton.php index 00c05170d6..c6dac32270 100644 --- a/includes/htmlform/HTMLTextFieldWithButton.php +++ b/includes/htmlform/HTMLTextFieldWithButton.php @@ -14,4 +14,4 @@ class HTMLTextFieldWithButton extends HTMLTextField { public function getInputHTML( $value ) { return $this->mClassWithButton->getElement( parent::getInputHTML( $value ) ); } -} \ No newline at end of file +} diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php index f7064556bf..687855a402 100644 --- a/includes/jobqueue/jobs/RefreshLinksJob.php +++ b/includes/jobqueue/jobs/RefreshLinksJob.php @@ -180,11 +180,11 @@ class RefreshLinksJob extends Job { // Revision ID must be passed to the parser output to get revision variables correct $parserOutput = $content->getParserOutput( $title, $revision->getId(), $parserOptions, false ); - $ellapsed = microtime( true ) - $start; + $elapsed = microtime( true ) - $start; // If it took a long time to render, then save this back to the cache to avoid // wasted CPU by other apaches or job runners. We don't want to always save to // cache as this can cause high cache I/O and LRU churn when a template changes. - if ( $ellapsed >= self::PARSE_THRESHOLD_SEC + if ( $elapsed >= self::PARSE_THRESHOLD_SEC && $page->isParserCacheUsed( $parserOptions, $revision->getId() ) && $parserOutput->isCacheable() ) { diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php index c65a3f9217..9fd5a36470 100644 --- a/includes/profiler/Profiler.php +++ b/includes/profiler/Profiler.php @@ -297,9 +297,9 @@ abstract class Profiler { * @return array List of method entries arrays, each having: * - name : method name * - calls : the number of invoking calls - * - real : real time ellapsed (ms) + * - real : real time elapsed (ms) * - %real : percent real time - * - cpu : CPU time ellapsed (ms) + * - cpu : CPU time elapsed (ms) * - %cpu : percent CPU time * - memory : memory used (bytes) * - %memory : percent memory used diff --git a/includes/profiler/SectionProfiler.php b/includes/profiler/SectionProfiler.php index bab8eba985..63940bc914 100644 --- a/includes/profiler/SectionProfiler.php +++ b/includes/profiler/SectionProfiler.php @@ -89,9 +89,9 @@ class SectionProfiler { * @return array List of method entries arrays, each having: * - name : method name * - calls : the number of invoking calls - * - real : real time ellapsed (ms) + * - real : real time elapsed (ms) * - %real : percent real time - * - cpu : real time ellapsed (ms) + * - cpu : real time elapsed (ms) * - %cpu : percent real time * - memory : memory used (bytes) * - %memory : percent memory used diff --git a/maintenance/copyFileBackend.php b/maintenance/copyFileBackend.php index 9ed63c3c56..b39ff55eda 100644 --- a/maintenance/copyFileBackend.php +++ b/maintenance/copyFileBackend.php @@ -226,8 +226,8 @@ class CopyFileBackend extends Maintenance { } $t_start = microtime( true ); $fsFiles = $src->getLocalReferenceMulti( array( 'srcs' => $srcPaths, 'latest' => 1 ) ); - $ellapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 ); - $this->output( "\n\tDownloaded these file(s) [{$ellapsed_ms}ms]:\n\t" . + $elapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 ); + $this->output( "\n\tDownloaded these file(s) [{$elapsed_ms}ms]:\n\t" . implode( "\n\t", $srcPaths ) . "\n\n" ); } @@ -281,12 +281,12 @@ class CopyFileBackend extends Maintenance { sleep( 10 ); // wait and retry copy again $status = $dst->doQuickOperations( $ops, array( 'bypassReadOnly' => 1 ) ); } - $ellapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 ); + $elapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 ); if ( !$status->isOK() ) { $this->error( print_r( $status->getErrorsArray(), true ) ); $this->error( "$wikiId: Could not copy file batch.", 1 ); // die } elseif ( count( $copiedRel ) ) { - $this->output( "\n\tCopied these file(s) [{$ellapsed_ms}ms]:\n\t" . + $this->output( "\n\tCopied these file(s) [{$elapsed_ms}ms]:\n\t" . implode( "\n\t", $copiedRel ) . "\n\n" ); } } @@ -318,12 +318,12 @@ class CopyFileBackend extends Maintenance { sleep( 10 ); // wait and retry copy again $status = $dst->doQuickOperations( $ops, array( 'bypassReadOnly' => 1 ) ); } - $ellapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 ); + $elapsed_ms = floor( ( microtime( true ) - $t_start ) * 1000 ); if ( !$status->isOK() ) { $this->error( print_r( $status->getErrorsArray(), true ) ); $this->error( "$wikiId: Could not delete file batch.", 1 ); // die } elseif ( count( $deletedRel ) ) { - $this->output( "\n\tDeleted these file(s) [{$ellapsed_ms}ms]:\n\t" . + $this->output( "\n\tDeleted these file(s) [{$elapsed_ms}ms]:\n\t" . implode( "\n\t", $deletedRel ) . "\n\n" ); } }