Merge "Miscellaneous profiling fixes"

diff --cc includes/EditPage.php
Simple merge

diff --cc includes/Linker.php
index 7d84a6a,d1a1ac0..6b0d444
--- 1/includes/Linker.php
--- 2/includes/Linker.php
+++ b/includes/Linker.php
@@@ -1927,16 -1921,9 +1927,16 @@@ class Linker 
                                        . wfMessage( 'word-separator' )->escaped()
                                        . $protected . '</li>';
                        }
 +
 +                      if ( $more instanceof Title ) {
 +                              $outText .= '<li>' . self::link( $more, wfMessage( 'moredotdotdot' ) ) . '</li>';
 +                      } elseif ( $more ) {
 +                              $outText .= "<li>$more</li>";
 +                      }
 +
                        $outText .= '</ul>';
                }
-               wfProfileOut( __METHOD__  );
+               wfProfileOut( __METHOD__ );
                return $outText;
        }