Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 7 insertions, 7 deletions

diff --git a/resources/src/mediawiki/mediawiki.debug.js b/resources/src/mediawiki/mediawiki.debug.js
index bdff99f7..f7210095 100644
--- a/resources/src/mediawiki/mediawiki.debug.js
+++ b/resources/src/mediawiki/mediawiki.debug.js
@@ -222,7 +222,7 @@
 						className: 'mw-debug-pane',
 						id: 'mw-debug-pane-' + id
 					} )
-					.append( panes[id] )
+					.append( panes[ id ] )
 					.appendTo( $container );
 			}
 
@@ -255,7 +255,7 @@
 			};
 
 			for ( i = 0, length = this.data.log.length; i < length; i += 1 ) {
-				entry = this.data.log[i];
+				entry = this.data.log[ i ];
 				entry.typeText = entryTypeText( entry.type );
 
 				$( '<tr>' )
@@ -289,13 +289,13 @@
 			.appendTo( $table );
 
 			for ( i = 0, length = this.data.queries.length; i < length; i += 1 ) {
-				query = this.data.queries[i];
+				query = this.data.queries[ i ];
 
 				$( '<tr>' )
 					.append( $( '<td>' ).text( i + 1 ) )
 					.append( $( '<td>' ).text( query.sql ) )
 					.append( $( '<td class="stats">' ).text( ( query.time * 1000 ).toFixed( 4 ) + 'ms' ) )
-					.append( $( '<td>' ).text( query['function'] ) )
+					.append( $( '<td>' ).text( query[ 'function' ] ) )
 				.appendTo( $table );
 			}
 
@@ -312,7 +312,7 @@
 			$list = $( '<ul>' );
 
 			for ( i = 0, length = this.data.debugLog.length; i < length; i += 1 ) {
-				line = this.data.debugLog[i];
+				line = this.data.debugLog[ i ];
 				$( '<li>' )
 					.html( mw.html.escape( line ).replace( /\n/g, '<br />\n' ) )
 					.appendTo( $list );
@@ -346,7 +346,7 @@
 
 					$( '<tr>' )
 						.append( $( '<th>' ).text( key ) )
-						.append( $( '<td>' ).text( data[key] ) )
+						.append( $( '<td>' ).text( data[ key ] ) )
 						.appendTo( $table );
 				}
 
@@ -370,7 +370,7 @@
 			$table = $( '<table>' );
 
 			for ( i = 0, length = this.data.includes.length; i < length; i += 1 ) {
-				file = this.data.includes[i];
+				file = this.data.includes[ i ];
 				$( '<tr>' )
 					.append( $( '<td>' ).text( file.name ) )
 					.append( $( '<td class="nr">' ).text( file.size ) )