Siebrand has uploaded a new change for review. https://gerrit.wikimedia.org/r/132936
Change subject: Update documentation and method visibility for SkinTemplate ...................................................................... Update documentation and method visibility for SkinTemplate Change-Id: I7c23e6c9f5189378fd1d33230820e8fd157a4750 --- M includes/SkinTemplate.php 1 file changed, 8 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/36/132936/1 diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php index e8fa944..d97d9d4 100644 --- a/includes/SkinTemplate.php +++ b/includes/SkinTemplate.php @@ -111,8 +111,8 @@ * roughly equivalent to PHPTAL 0.7. * * @param string $classname - * @param string $repository Subdirectory where we keep template files - * @param string $cache_dir + * @param bool|string $repository Subdirectory where we keep template files + * @param bool|string $cache_dir * @return QuickTemplate * @private */ @@ -1212,10 +1212,10 @@ /** * an array of edit links by default used for the tabs + * @param $content_navigation * @return array - * @private */ - function buildContentActionUrls( $content_navigation ) { + private function buildContentActionUrls( $content_navigation ) { wfProfileIn( __METHOD__ ); @@ -1226,9 +1226,7 @@ $content_actions = array(); foreach ( $content_navigation as $links ) { - foreach ( $links as $key => $value ) { - if ( isset( $value['redundant'] ) && $value['redundant'] ) { // Redundant tabs are dropped from content_actions continue; @@ -1249,9 +1247,7 @@ } $content_actions[$key] = $value; - } - } wfProfileOut( __METHOD__ ); @@ -1259,10 +1255,9 @@ return $content_actions; } - /** + /** * build array of common navigation links * @return array - * @private */ protected function buildNavUrls() { global $wgUploadNavigationUrl; @@ -1379,9 +1374,8 @@ /** * Generate strings used for xml 'id' names * @return string - * @private */ - function getNameSpaceKey() { + protected function getNameSpaceKey() { return $this->getTitle()->getNamespaceKey(); } } @@ -2048,6 +2042,7 @@ * If you pass "flat" as an option then the returned array will be a flat array * of footer icons instead of a key/value array of footerlinks arrays broken * up into categories. + * @param string $option * @return array|mixed */ function getFooterLinks( $option = null ) { @@ -2087,6 +2082,7 @@ * in the list of footer icons. This is mostly useful for skins which only * display the text from footericons instead of the images and don't want a * duplicate copyright statement because footerlinks already rendered one. + * @param string $option * @return string */ function getFooterIcons( $option = null ) { @@ -2129,5 +2125,4 @@ <?php $this->html( 'reporttime' ) ?> <?php } - } -- To view, visit https://gerrit.wikimedia.org/r/132936 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7c23e6c9f5189378fd1d33230820e8fd157a4750 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Siebrand <siebr...@kitano.nl> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits