| Index: branches/REL1_4/phase3/includes/SkinTemplate.php |
| — | — | @@ -907,7 +907,14 @@ |
| 908 | 908 | $s = '/* generated javascript */'; |
| 909 | 909 | $s .= "var skin = '{$this->skinname}';\nvar stylepath = '{$wgStylePath}';"; |
| 910 | 910 | $s .= '/* MediaWiki:'.ucfirst($this->skinname)." */\n"; |
| 911 | | - $s .= wfMsg(ucfirst($this->skinname).'.js'); |
| | 911 | + |
| | 912 | + // avoid inclusion of non defined user JavaScript (with custom skins only) |
| | 913 | + // by checking for default message content |
| | 914 | + $msgKey = ucfirst($this->skinname).'.js'; |
| | 915 | + $userJS = wfMsg($msgKey); |
| | 916 | + if ('<'.$msgKey.'>' != $userJS) { |
| | 917 | + $s .= $userJS; |
| | 918 | + } |
| 912 | 919 | |
| 913 | 920 | wfProfileOut( $fname ); |
| 914 | 921 | return $s; |
| Index: branches/REL1_4/phase3/RELEASE-NOTES |
| — | — | @@ -551,6 +551,7 @@ |
| 552 | 552 | === 1.4.4 fixes === |
| 553 | 553 | |
| 554 | 554 | * (bug 725) Let dir="ltr" attribute work again in MonoBook on RTL languages |
| | 555 | +* (bug 2024) Skip JavaScript error for custom skins where .js message not set |
| 555 | 556 | |
| 556 | 557 | |
| 557 | 558 | === Caveats === |