| Index: trunk/extensions/EducationProgram/specials/SpecialInstitutions.php |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | EPOrg::displayPager( $this->getContext() ); |
| 41 | 41 | } |
| 42 | 42 | else { |
| 43 | | - $this->getOutput()->redirect( SpecialPage::getTitleFor( 'Institution', $this->subPage )->getLocalURL() ); |
| | 43 | + $this->getOutput()->redirect( Title::newFromText( $this->subPage, EP_NS_INSTITUTION )->getLocalURL() ); |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
| Index: trunk/extensions/EducationProgram/specials/SpecialEPPage.php |
| — | — | @@ -112,18 +112,6 @@ |
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
| 116 | | - * Get the Language being used for this instance. |
| 117 | | - * getLang was deprecated in 1.19, getLanguage was introduced in the same version. |
| 118 | | - * |
| 119 | | - * @since 0.1 |
| 120 | | - * |
| 121 | | - * @return Language |
| 122 | | - */ |
| 123 | | - public function getLanguage() { |
| 124 | | - return method_exists( get_parent_class(), 'getLanguage' ) ? parent::getLanguage() : $this->getLang(); |
| 125 | | - } |
| 126 | | - |
| 127 | | - /** |
| 128 | 116 | * Adds a navigation menu with the provided links. |
| 129 | 117 | * Links should be provided in an array with: |
| 130 | 118 | * label => Title (object) |
| Index: trunk/extensions/EducationProgram/specials/SpecialCourses.php |
| — | — | @@ -39,7 +39,7 @@ |
| 40 | 40 | EPCourse::displayPager( $this->getContext() ); |
| 41 | 41 | } |
| 42 | 42 | else { |
| 43 | | - $this->getOutput()->redirect( SpecialPage::getTitleFor( 'Course', $this->subPage )->getLocalURL() ); |
| | 43 | + $this->getOutput()->redirect( Title::newFromText( $this->subPage, EP_NS_COURSE )->getLocalURL() ); |
| 44 | 44 | } |
| 45 | 45 | } |
| 46 | 46 | |
| Index: trunk/extensions/EducationProgram/includes/EPRevisionPager.php |
| — | — | @@ -62,7 +62,7 @@ |
| 63 | 63 | * @return Language |
| 64 | 64 | */ |
| 65 | 65 | public function getLanguage() { |
| 66 | | - return method_exists( $this->context, 'getLanguage' ) ? $this->context->getLanguage() : $this->context->getLang(); |
| | 66 | + return $this->context->getLanguage(); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /** |
| Index: trunk/extensions/EducationProgram/includes/EPCoursePager.php |
| — | — | @@ -32,8 +32,6 @@ |
| 33 | 33 | 'name', |
| 34 | 34 | 'org_id', |
| 35 | 35 | 'term', |
| 36 | | - 'start', |
| 37 | | - 'end', |
| 38 | 36 | 'lang', |
| 39 | 37 | 'students', |
| 40 | 38 | ); |
| — | — | @@ -101,8 +99,8 @@ |
| 102 | 100 | return array( |
| 103 | 101 | 'name', |
| 104 | 102 | 'term', |
| 105 | | - 'start', |
| 106 | | - 'end', |
| | 103 | +// 'start', |
| | 104 | +// 'end', |
| 107 | 105 | 'lang', |
| 108 | 106 | 'students', |
| 109 | 107 | ); |
| Index: trunk/extensions/EducationProgram/includes/EPPager.php |
| — | — | @@ -87,7 +87,7 @@ |
| 88 | 88 | * @return Language |
| 89 | 89 | */ |
| 90 | 90 | public function getLanguage() { |
| 91 | | - return method_exists( $this->context, 'getLanguage' ) ? $this->context->getLanguage() : $this->context->getLang(); |
| | 91 | + return $this->context->getLanguage(); |
| 92 | 92 | } |
| 93 | 93 | |
| 94 | 94 | /** |