| Index: branches/wmf-deployment/extensions/LiquidThreads/classes/Dispatch.php |
| — | — | @@ -107,7 +107,7 @@ |
| 108 | 108 | in_array( $title->getPrefixedText(), $wgLqtPages ); |
| 109 | 109 | |
| 110 | 110 | if ( $title->exists() ) { |
| 111 | | - $override = self::getUserLqtOverride( $title->getArticleId() ); |
| | 111 | + $override = self::getUserLqtOverride( $title ); |
| 112 | 112 | } else { |
| 113 | 113 | $override = null; |
| 114 | 114 | } |
| — | — | @@ -122,13 +122,12 @@ |
| 123 | 123 | return $isTalkPage; |
| 124 | 124 | } |
| 125 | 125 | |
| 126 | | - static function getUserLqtOverride( $article ) { |
| 127 | | - if ( !is_object( $article ) ) { |
| 128 | | - $article = Article::newFromId( $article ); |
| | 126 | + static function getUserLqtOverride( $title ) { |
| | 127 | + if ( ! is_object($title) ) { |
| | 128 | + return null; |
| 129 | 129 | } |
| 130 | 130 | |
| 131 | | - $title = $article->getTitle(); |
| 132 | | - $articleid = $article->getId(); |
| | 131 | + $articleid = $title->getArticleId(); |
| 133 | 132 | |
| 134 | 133 | global $wgLiquidThreadsAllowUserControlNamespaces; |
| 135 | 134 | global $wgLiquidThreadsAllowUserControl; |
| Property changes on: branches/wmf-deployment/extensions/LiquidThreads/classes/Dispatch.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 136 | 135 | + /trunk/extensions/LiquidThreads/classes/Dispatch.php:57390,58990-62113,62138 |