| Index: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContestPage.php |
| — | — | @@ -180,5 +180,17 @@ |
| 181 | 181 | |
| 182 | 182 | $this->getOutput()->addHTML( self::getNavigation( $subPage, $this->getUser(), $this->getLang(), $this->getName() ) ); |
| 183 | 183 | } |
| | 184 | + |
| | 185 | + /** |
| | 186 | + * Get the Language being used for this instance. |
| | 187 | + * getLang was deprecated in 1.19, getLanguage was introduces in the same version. |
| | 188 | + * |
| | 189 | + * @since 0.2 |
| | 190 | + * |
| | 191 | + * @return Language |
| | 192 | + */ |
| | 193 | + public function getLanguage() { |
| | 194 | + return method_exists( get_parent_class(), 'getLanguage' ) ? parent::getLanguage() : $this->getLang(); |
| | 195 | + } |
| 184 | 196 | |
| 185 | 197 | } |
| Index: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialContest.php |
| — | — | @@ -304,7 +304,7 @@ |
| 305 | 305 | $this->getOutput()->addHTML( |
| 306 | 306 | '<fieldset>' . |
| 307 | 307 | '<legend>' . wfMsgHtml( 'contest-contest-showonly' ) . '</legend>' . |
| 308 | | - '<form method="post" action="' . $GLOBALS['wgScript'] . '?title=' . $title . '">' . |
| | 308 | + '<form method="post" action="' . htmlspecialchars( wfAppendQuery( $GLOBALS['wgScript'], array( 'title' => $title ) ) ) . '">' . |
| 309 | 309 | Html::hidden( 'title', $title ) . |
| 310 | 310 | $this->getDropdownHTML( |
| 311 | 311 | 'challenge', |
| Index: branches/wmf/1.18wmf1/extensions/Contest/specials/SpecialEditContest.php |
| — | — | @@ -395,6 +395,18 @@ |
| 396 | 396 | '<p class="visualClear warningbox">' . wfMsgExt( $message, 'parseinline' ) . '</p>' |
| 397 | 397 | ); |
| 398 | 398 | } |
| | 399 | + |
| | 400 | + /** |
| | 401 | + * Get the Language being used for this instance. |
| | 402 | + * getLang was deprecated in 1.19, getLanguage was introduces in the same version. |
| | 403 | + * |
| | 404 | + * @since 0.2 |
| | 405 | + * |
| | 406 | + * @return Language |
| | 407 | + */ |
| | 408 | + public function getLanguage() { |
| | 409 | + return method_exists( get_parent_class(), 'getLanguage' ) ? parent::getLanguage() : $this->getLang(); |
| | 410 | + } |
| 399 | 411 | |
| 400 | 412 | } |
| 401 | 413 | |
| Property changes on: branches/wmf/1.18wmf1/extensions/Contest |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 402 | 414 | Merged /trunk/extensions/Contest:r106452,106603,106708-106709,106713-106714 |