r85614 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r85613‎ | r85614 | r85615 >
Date:11:06, 7 April 2011
Author:catrope
Status:ok
Tags:
Comment:
1.17wmf1: Fix botched merge of r84985 in r85256, was causing JS errors
Modified paths:
  • /branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js (modified) (history)

Diff [purge]

Index: branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js
@@ -622,12 +622,8 @@
623623 }
624624 }
625625 } catch ( e ) {
626 - // This needs to NOT use mw.log because these errors are common in production mode
627 - // and not in debug mode, such as when a symbol that should be global isn't exported
628 - if ( window.console && typeof window.console.log === 'function' ) {
629 - console.log( _fn + 'Exception thrown by ' + module + ': ' + e.message );
630 - console.log( e );
631 - }
 626+ mediaWiki.log( 'Exception thrown by ' + module + ': ' + e.message );
 627+ mediaWiki.log( e );
632628 registry[module].state = 'error';
633629 // Run error callbacks of jobs affected by this condition
634630 for ( var j = 0; j < jobs.length; j++ ) {
Property changes on: branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js
___________________________________________________________________
Modified: svn:mergeinfo
635631 Reverse-merged /trunk/phase3/resources/mediawiki/mediawiki.js:r80813,80815,83798,84459,84729,84820,84985,85140,85152,85194

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r84985Swtiched to using console.log if present so that when errors occur inside of ...tparscal22:08, 29 March 2011
r852561.17wmf1: MFT r80813, r80815, r83798, r84459, r84729, r84820, r84921, r84985,...catrope14:13, 3 April 2011

Status & tagging log