| Index: branches/wmf-deployment/extensions/LiquidThreads/pages/ThreadPermalinkView.php |
| — | — | @@ -137,18 +137,6 @@ |
| 138 | 138 | $this->doInlineEditForm(); |
| 139 | 139 | return false; |
| 140 | 140 | } |
| 141 | | - |
| 142 | | - // Expose feed links. |
| 143 | | - global $wgFeedClasses, $wgScriptPath, $wgServer; |
| 144 | | - $thread = $this->thread->topmostThread()->title()->getPrefixedText(); |
| 145 | | - $apiParams = array( 'action' => 'feedthreads', 'type' => 'replies|newthreads', |
| 146 | | - 'thread' => $thread ); |
| 147 | | - $urlPrefix = wfScript('api').'?'; |
| 148 | | - foreach( $wgFeedClasses as $format => $class ) { |
| 149 | | - $theseParams = $apiParams + array( 'feedformat' => $format ); |
| 150 | | - $url = $urlPrefix . wfArrayToCGI( $theseParams ); |
| 151 | | - $this->output->addFeedLink( $format, $url ); |
| 152 | | - } |
| 153 | 141 | |
| 154 | 142 | self::addJSandCSS(); |
| 155 | 143 | $this->output->setSubtitle( $this->getSubtitle() ); |
| Index: branches/wmf-deployment/extensions/LiquidThreads/pages/TalkpageView.php |
| — | — | @@ -183,17 +183,6 @@ |
| 184 | 184 | $this->output->setPageTitle( $this->title->getPrefixedText() ); |
| 185 | 185 | self::addJSandCSS(); |
| 186 | 186 | |
| 187 | | - // Expose feed links. |
| 188 | | - global $wgFeedClasses, $wgScriptPath, $wgServer; |
| 189 | | - $apiParams = array( 'action' => 'feedthreads', 'type' => 'replies|newthreads', |
| 190 | | - 'talkpage' => $this->title->getPrefixedText() ); |
| 191 | | - $urlPrefix = wfScript('api').'?'; |
| 192 | | - foreach( $wgFeedClasses as $format => $class ) { |
| 193 | | - $theseParams = $apiParams + array( 'feedformat' => $format ); |
| 194 | | - $url = $urlPrefix . wfArrayToCGI( $theseParams ); |
| 195 | | - $this->output->addFeedLink( $format, $url ); |
| 196 | | - } |
| 197 | | - |
| 198 | 187 | $sk = $this->user->getSkin(); |
| 199 | 188 | |
| 200 | 189 | $article = new Article( $this->title ); |
| Property changes on: branches/wmf-deployment/extensions/LiquidThreads |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 201 | 190 | - /branches/REL1_15/phase3/extensions/LiquidThreads:51646 |
| /trunk/extensions/LiquidThreads:56151-57134 |
| /trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |
| 202 | 191 | + /branches/REL1_15/phase3/extensions/LiquidThreads:51646 |
| /trunk/extensions/LiquidThreads:56151-57116,57130-57134 |
| /trunk/phase3/extensions/LiquidThreads:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 |