r81908 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r81907‎ | r81908 | r81909 >
Date:18:05, 10 February 2011
Author:platonides
Status:ok
Tags:
Comment:
Merge r81884 (the other half is already in trunk)
Modified paths:
  • /trunk/extensions/Gadgets/Gadgets_body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Gadgets/Gadgets_body.php
@@ -359,6 +359,7 @@
360360 $struct = self::loadStructuredList();
361361 if ( !$struct ) {
362362 $gadgets = $struct;
 363+ wfProfileOut( __METHOD__ );
363364 return $gadgets;
364365 }
365366
@@ -491,4 +492,4 @@
492493 public function getDependencies() {
493494 return $this->dependencies;
494495 }
495 -}
\ No newline at end of file
 496+}
Property changes on: trunk/extensions/Gadgets/Gadgets_body.php
___________________________________________________________________
Added: svn:mergeinfo
496497 Merged /branches/Gadgets-work/Gadgets_body.php:r73145-76526
497498 Merged /branches/wmf/1.17wmf1/extensions/Gadgets/Gadgets_body.php:r81884

Follow-up revisions

RevisionCommit summaryAuthorDate
r85027MFT various extension fixes: r81713, r81742, r81743, r81908, r81966, r81969, ...demon18:23, 30 March 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r81884Profiling fixeststarling12:09, 10 February 2011

Status & tagging log