Update to MediaWiki 1.26.0

2 files changed, 11 insertions, 2 deletions

diff --git a/includes/templates/Usercreate.php b/includes/templates/Usercreate.php
index f09b6bba..a39690a7 100644
--- a/includes/templates/Usercreate.php
+++ b/includes/templates/Usercreate.php
@@ -38,8 +38,6 @@ class UsercreateTemplate extends BaseTemplate {
 	}
 
 	function execute() {
-		global $wgCookieExpiration;
-		$expirationDays = ceil( $wgCookieExpiration / ( 3600 * 24 ) );
 ?>
 <div class="mw-ui-container">
 	<?php if ( $this->haveData( 'languages' ) ) { ?>
@@ -73,6 +71,12 @@ class UsercreateTemplate extends BaseTemplate {
 			<?php } ?>
 			</div>
 
+			<?php if ( $this->data['formheader'] ) { ?>
+				<div class="mw-form-formheader">
+					<?php $this->html( 'formheader' ); /* extensions such as MobileFrontend add html here */ ?>
+				</div>
+			<?php } ?>
+
 			<div class="mw-ui-vform-field">
 				<label for='wpName2'>
 					<?php $this->msg( 'userlogin-yourname' ); ?>
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 345bb71b..4a0b413f 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -56,6 +56,11 @@ class UserloginTemplate extends BaseTemplate {
 				</div>
 			<?php } ?>
 
+			<?php if ( $this->data['formheader'] ) { ?>
+				<div class="mw-form-formheader">
+					<?php $this->html( 'formheader' ); /* extensions such as MobileFrontend add html here */ ?>
+				</div>
+			<?php } ?>
 			<div class="mw-ui-vform-field">
 				<label for='wpName1'>
 					<?php