| Index: branches/wmf/1.18wmf1/includes/OutputPage.php |
| — | — | @@ -2227,7 +2227,8 @@ |
| 2228 | 2228 | * @return String: The doctype, opening <html>, and head element. |
| 2229 | 2229 | */ |
| 2230 | 2230 | public function headElement( Skin $sk, $includeStyle = true ) { |
| 2231 | | - global $wgContLang, $wgUseTrackbacks; |
| | 2231 | + global $wgContLang, $wgUseTrackbacks, $mediaWiki; |
| | 2232 | + |
| 2232 | 2233 | $userdir = $this->getLang()->getDir(); |
| 2233 | 2234 | $sitedir = $wgContLang->getDir(); |
| 2234 | 2235 | |
| — | — | @@ -2291,6 +2292,7 @@ |
| 2292 | 2293 | } |
| 2293 | 2294 | $bodyAttrs['class'] .= ' ' . $sk->getPageClasses( $this->getTitle() ); |
| 2294 | 2295 | $bodyAttrs['class'] .= ' skin-' . Sanitizer::escapeClass( $sk->getSkinName() ); |
| | 2296 | + $bodyAttrs['class'] .= ' action-' . Sanitizer::escapeClass( $mediaWiki->getPerformedAction() ); |
| 2295 | 2297 | |
| 2296 | 2298 | $sk->addToBodyAttributes( $this, $bodyAttrs ); // Allow skins to add body attributes they need |
| 2297 | 2299 | wfRunHooks( 'OutputPageBodyAttributes', array( $this, $sk, &$bodyAttrs ) ); |
| Property changes on: branches/wmf/1.18wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2298 | 2300 | Merged /trunk/phase3/includes/OutputPage.php:r108345 |
| Index: branches/wmf/1.18wmf1/includes/Skin.php |
| — | — | @@ -1238,6 +1238,12 @@ |
| 1239 | 1239 | if ( strpos( $line, '|' ) !== false ) { // sanity check |
| 1240 | 1240 | $line = MessageCache::singleton()->transform( $line, false, null, $this->getTitle() ); |
| 1241 | 1241 | $line = array_map( 'trim', explode( '|', $line, 2 ) ); |
| | 1242 | + if ( count( $line ) !== 2 ) { |
| | 1243 | + // Second sanity check, could be hit by people doing |
| | 1244 | + // funky stuff with parserfuncs... (bug 3321) |
| | 1245 | + continue; |
| | 1246 | + } |
| | 1247 | + |
| 1242 | 1248 | $extraAttribs = array(); |
| 1243 | 1249 | |
| 1244 | 1250 | $msgLink = wfMessage( $line[0] )->inContentLanguage(); |
| — | — | @@ -1249,7 +1255,6 @@ |
| 1250 | 1256 | } else { |
| 1251 | 1257 | $link = $line[0]; |
| 1252 | 1258 | } |
| 1253 | | - |
| 1254 | 1259 | $msgText = wfMessage( $line[1] ); |
| 1255 | 1260 | if ( $msgText->exists() ) { |
| 1256 | 1261 | $text = $msgText->text(); |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1257 | 1262 | Merged /trunk/phase3/includes:r108145,108345 |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1258 | 1263 | Merged /trunk/phase3:r108145,108345 |