Merge branch 'patch-fix' to fix branch commits

CHANGELOG.md

@@ -1,3 +1,9 @@
+## Version 2.3.0
+* [compatibility, deprecated] Fix for deprecated wfSuppressWarnings and wfRestoreWarnings with new Wikimedia\...
+* [bug, code] Remove duplicated prepend call in foreground.js
+* [b/c break] Version minor bump, MW >= 1.34 now required
+* [enhancement] Use of requires MW >= 1.34 in skin.json
+
 ## Version 2.2.4
 * [bug] PR #352 Breaks Compatibility with MW < 1.34 - Rollback for re-release as v2.3.0
 * [compatibility] Final Release v2.x.x requires MW <= 1.33

Foreground.skin.php

@@ -60,7 +60,7 @@ class foregroundTemplate extends BaseTemplate {
 	public function execute() {
 		global $wgUser;
 		global $wgForegroundFeatures;
-		wfSuppressWarnings();
+		Wikimedia\suppressWarnings();
 		$this->html('headelement');
 		switch ($wgForegroundFeatures['enableTabs']) {
 			case true:
@@ -278,7 +278,7 @@ class foregroundTemplate extends BaseTemplate {
 		</html>
 
 <?php
-		wfRestoreWarnings();
+		Wikimedia\suppressWarnings();
 	}
 }
-?>
+?>

assets/scripts/foreground.js

@@ -1,4 +1,3 @@
-
 jQuery(document).ready(function() {
 
   // Log errors
@@ -76,5 +75,4 @@ if ( jQuery( '#ca-addsection' ).length ) {
 jQuery(window).load(function() {
   jQuery('li#ca-ve-edit a').prepend('<div class="drop-icon"><i class="fa fa-pencil fa-fw"></i></div>')
   jQuery('li#ca-viewsource a').prepend('<div class="drop-icon"><i class="fa fa-book fa-fw"></i></div>')
-  jQuery('li#ca-edit a').prepend('<div class="drop-icon"><i class="fa fa-pencil-square-o fa-fw"></i></div>')
 });

skin.json

@@ -1,6 +1,6 @@
 {
 	"name": "Foreground",
-	"version": "2.2.4",
+	"version": "2.3.0",
 	"author": [
 		"Garrick Van Buren",
 		"Jamie Thingelstad",
@@ -14,6 +14,9 @@
 	"ValidSkinNames": {
 		"foreground": "Foreground"
 	},
+	"requires": {
+		"MediaWiki": ">= 1.34.0"
+	},
 	"MessagesDirs": {
 		"SkinForeground": [
 			"i18n"
@@ -72,4 +75,4 @@
 	},
 	"config": {},
 	"manifest_version": 1
-}
+}