jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: Improve HTML output to avoid validation errors
......................................................................


Hygiene: Improve HTML output to avoid validation errors

Run HTML Validator when PHP code in includes/skins changes to surface
better visibility (note there is still one error due to bug 38630

Change-Id: Ic05f2a1698ae2f9467fa3a59a96a36fbded75fef
---
M includes/skins/SkinMinerva.php
M scripts/pre-commit
2 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Kaldari: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 0fab93d..54505f8 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -144,6 +144,9 @@
                                $menu['talk']['class'] = 
$tpl->data['_talkdata']['class'];
                        }
                }
+               // sanitize to avoid invalid HTML5 markup being produced
+               unset( $menu['talk']['primary'] );
+               unset( $menu['talk']['context'] );
 
                $watchTemplate = array(
                        'id' => 'ca-watch',
diff --git a/scripts/pre-commit b/scripts/pre-commit
index d58b1a6..7a08cf2 100755
--- a/scripts/pre-commit
+++ b/scripts/pre-commit
@@ -9,6 +9,9 @@
 if git diff --name-only --cached | grep -P '\.js$' ; then
        make qunit
 fi
+if git diff --name-only --cached | grep -P 'includes/skins/.*php$' ; then
+       make validatehtml
+fi
 for file in `git diff --cached --name-only | grep ".png\$"`
 do
        [ -f $file ] && echo "Compressing $file" &&  \

-- 
To view, visit https://gerrit.wikimedia.org/r/83821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic05f2a1698ae2f9467fa3a59a96a36fbded75fef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to