| Index: trunk/extensions/EducationProgram/specials/SpecialInstitutions.php |
| — | — | @@ -40,7 +40,7 @@ |
| 41 | 41 | |
| 42 | 42 | if ( $this->getUser()->isAllowed( 'ep-org' ) ) { |
| 43 | 43 | $this->getOutput()->addModules( 'ep.addorg' ); |
| 44 | | - $this->addCachedHTML( 'EPOrg::getAddNewControl' ); |
| | 44 | + $this->addCachedHTML( 'EPOrg::getAddNewControl', $this->getContext() ); |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | $this->addCachedHTML( 'EPOrg::getPager', $this->getContext() ); |
| Index: trunk/extensions/EducationProgram/includes/EPOrg.php |
| — | — | @@ -140,11 +140,12 @@ |
| 141 | 141 | * |
| 142 | 142 | * @since 0.1 |
| 143 | 143 | * |
| | 144 | + * @param IContextSource $context |
| 144 | 145 | * @param array $args |
| 145 | 146 | * |
| 146 | 147 | * @return string |
| 147 | 148 | */ |
| 148 | | - public static function getAddNewControl( array $args = array() ) { |
| | 149 | + public static function getAddNewControl( IContextSource $context, array $args = array() ) { |
| 149 | 150 | $html = ''; |
| 150 | 151 | |
| 151 | 152 | $html .= Html::openElement( |
| — | — | @@ -157,12 +158,12 @@ |
| 158 | 159 | |
| 159 | 160 | $html .= '<fieldset>'; |
| 160 | 161 | |
| 161 | | - $html .= '<legend>' . wfMsgHtml( 'ep-institutions-addnew' ) . '</legend>'; |
| | 162 | + $html .= '<legend>' . $context->msg( 'ep-institutions-addnew' )->escaped() . '</legend>'; |
| 162 | 163 | |
| 163 | | - $html .= Html::element( 'p', array(), wfMsg( 'ep-institutions-namedoc' ) ); |
| | 164 | + $html .= Html::element( 'p', array(), $context->msg( 'ep-institutions-namedoc' )->plain() ); |
| 164 | 165 | |
| 165 | 166 | $html .= Xml::inputLabel( |
| 166 | | - wfMsg( 'ep-institutions-newname' ), |
| | 167 | + $context->msg( 'ep-institutions-newname' )->plain(), |
| 167 | 168 | 'newname', |
| 168 | 169 | 'newname', |
| 169 | 170 | false, |
| — | — | @@ -171,7 +172,7 @@ |
| 172 | 173 | |
| 173 | 174 | $html .= ' ' . Html::input( |
| 174 | 175 | 'addneworg', |
| 175 | | - wfMsg( 'ep-institutions-add' ), |
| | 176 | + $context->msg( 'ep-institutions-add' )->plain(), |
| 176 | 177 | 'submit', |
| 177 | 178 | array( |
| 178 | 179 | 'disabled' => 'disabled', |
| Index: trunk/extensions/EducationProgram/includes/EPCourse.php |
| — | — | @@ -316,7 +316,7 @@ |
| 317 | 317 | |
| 318 | 318 | $html .= '<p>' . $context->msg( 'ep-courses-namedoc' )->escaped() . '</p>'; |
| 319 | 319 | |
| 320 | | - $html .= Html::element( 'label', array( 'for' => 'neworg' ), $context->msg( 'ep-courses-neworg' ) ); |
| | 320 | + $html .= Html::element( 'label', array( 'for' => 'neworg' ), $context->msg( 'ep-courses-neworg' )->plain() ); |
| 321 | 321 | |
| 322 | 322 | $select = new XmlSelect( |
| 323 | 323 | 'neworg', |
| — | — | @@ -328,7 +328,7 @@ |
| 329 | 329 | $html .= $select->getHTML(); |
| 330 | 330 | |
| 331 | 331 | $html .= ' ' . Xml::inputLabel( |
| 332 | | - $context->msg( 'ep-courses-newname' )->escaped(), |
| | 332 | + $context->msg( 'ep-courses-newname' )->plain(), |
| 333 | 333 | 'newname', |
| 334 | 334 | 'newname', |
| 335 | 335 | 20, |
| — | — | @@ -336,7 +336,7 @@ |
| 337 | 337 | ); |
| 338 | 338 | |
| 339 | 339 | $html .= ' ' . Xml::inputLabel( |
| 340 | | - $context->msg( 'ep-courses-newterm' )->escaped(), |
| | 340 | + $context->msg( 'ep-courses-newterm' )->plain(), |
| 341 | 341 | 'newterm', |
| 342 | 342 | 'newterm', |
| 343 | 343 | 10, |
| — | — | @@ -345,7 +345,7 @@ |
| 346 | 346 | |
| 347 | 347 | $html .= ' ' . Html::input( |
| 348 | 348 | 'addnewcourse', |
| 349 | | - $context->msg( 'ep-courses-add' )->escaped(), |
| | 349 | + $context->msg( 'ep-courses-add' )->plain(), |
| 350 | 350 | 'submit', |
| 351 | 351 | array( |
| 352 | 352 | 'disabled' => 'disabled', |