| Index: branches/wmf/1.18wmf1/includes/OutputPage.php |
| — | — | @@ -2227,8 +2227,7 @@ |
| 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, $mediaWiki; |
| 2232 | | - |
| | 2231 | + global $wgContLang, $wgUseTrackbacks; |
| 2233 | 2232 | $userdir = $this->getLang()->getDir(); |
| 2234 | 2233 | $sitedir = $wgContLang->getDir(); |
| 2235 | 2234 | |
| — | — | @@ -2292,7 +2291,6 @@ |
| 2293 | 2292 | } |
| 2294 | 2293 | $bodyAttrs['class'] .= ' ' . $sk->getPageClasses( $this->getTitle() ); |
| 2295 | 2294 | $bodyAttrs['class'] .= ' skin-' . Sanitizer::escapeClass( $sk->getSkinName() ); |
| 2296 | | - $bodyAttrs['class'] .= ' action-' . Sanitizer::escapeClass( $mediaWiki->getPerformedAction() ); |
| 2297 | 2295 | |
| 2298 | 2296 | $sk->addToBodyAttributes( $this, $bodyAttrs ); // Allow skins to add body attributes they need |
| 2299 | 2297 | wfRunHooks( 'OutputPageBodyAttributes', array( $this, $sk, &$bodyAttrs ) ); |
| Property changes on: branches/wmf/1.18wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 2300 | 2298 | Reverse-merged /trunk/phase3/includes/OutputPage.php:r108345 |
| Index: branches/wmf/1.18wmf1/includes/Skin.php |
| — | — | @@ -435,6 +435,7 @@ |
| 436 | 436 | * @return String |
| 437 | 437 | */ |
| 438 | 438 | function getPageClasses( $title ) { |
| | 439 | + global $wgRequest; |
| 439 | 440 | $numeric = 'ns-' . $title->getNamespace(); |
| 440 | 441 | |
| 441 | 442 | if ( $title->getNamespace() == NS_SPECIAL ) { |
| — | — | @@ -453,8 +454,13 @@ |
| 454 | 455 | } |
| 455 | 456 | |
| 456 | 457 | $name = Sanitizer::escapeClass( 'page-' . $title->getPrefixedText() ); |
| 457 | | - |
| 458 | | - return "$numeric $type $name"; |
| | 458 | + |
| | 459 | + if ( $wgRequest->getVal('action') ) { |
| | 460 | + $action = 'action-' . $wgRequest->getVal('action'); |
| | 461 | + } else { |
| | 462 | + $action = 'action-view'; |
| | 463 | + } |
| | 464 | + return "$numeric $type $name $action"; |
| 459 | 465 | } |
| 460 | 466 | |
| 461 | 467 | /** |