https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114279
Revision: 114279
Author: jeroendedauw
Date: 2012-03-20 16:37:58 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
moved refresh tab hooks
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.hooks.php
trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php
Removed Paths:
-------------
trunk/extensions/SemanticMediaWiki/includes/SMW_RefreshTab.php
Modified: trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.hooks.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.hooks.php
2012-03-20 16:24:17 UTC (rev 114278)
+++ trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.hooks.php
2012-03-20 16:37:58 UTC (rev 114279)
@@ -234,4 +234,48 @@
return true;
}
+ /**
+ * @see https://www.mediawiki.org/wiki/Manual:Hooks/SkinTemplateTabs
+ * This is here for compatibility with MediaWiki 1.17. Once we can
require 1.18, we can ditch this code :)
+ *
+ * @since 0.1
+ *
+ * @param SkinTemplate $skinTemplate
+ * @param array $contentActions
+ *
+ * @return true
+ */
+ public static function addRefreshTab( SkinTemplate $skinTemplate, array
&$contentActions ) {
+ global $wgUser;
+
+ if ( $wgUser->isAllowed( 'purge' ) ) {
+ $contentActions['purge'] = array(
+ 'class' => false,
+ 'text' => wfMsg( 'smw_purge' ),
+ 'href' =>
$skinTemplate->getTitle()->getLocalUrl( array( 'action' => 'purge' ) )
+ );
+ }
+
+ return true;
+ }
+
+ /**
+ * Alter the structured navigation links in SkinTemplates.
+ * @see
https://www.mediawiki.org/wiki/Manual:Hooks/SkinTemplateNavigation
+ *
+ * @since 1.8
+ *
+ * @param SkinTemplate $skinTemplate
+ * @param array $links
+ *
+ * @return true
+ */
+ public static function addStructuredRefreshTab( SkinTemplate
&$skinTemplate, array &$links ) {
+ $actions = $links['actions'];
+ self::addRefreshTab( $skinTemplate, $actions );
+ $links['actions'] = $actions;
+
+ return true;
+ }
+
}
Deleted: trunk/extensions/SemanticMediaWiki/includes/SMW_RefreshTab.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_RefreshTab.php
2012-03-20 16:24:17 UTC (rev 114278)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_RefreshTab.php
2012-03-20 16:37:58 UTC (rev 114279)
@@ -1,47 +0,0 @@
-<?php
-/**
- * @file
- * @ingroup SMW
- */
-
-/**
- * Protect against register_globals vulnerabilities.
- * This line must be present before any global variable is referenced.
- */
-if ( !defined( 'MEDIAWIKI' ) ) {
- die();
-}
-
-global $wgHooks;
-
-$wgHooks['SkinTemplateTabs'][] = 'smwfAddRefreshTab'; // basic tab addition
-$wgHooks['SkinTemplateNavigation'][] = 'smwfAddStructuredRefreshTab'; //
structured version for "Vector"-type skins
-
-/**
- * Extends the provided array of content actions with an action that refreshes
the article,
- * i.e. it purges the article from the cache and thus refreshes the inline
queries.
- */
-function smwfAddRefreshTab( $skin, &$content_actions ) {
- global $wgUser;
- if ( $wgUser->isAllowed( 'purge' ) ) {
- // Skin::getTitle() was added in MW 1.16
- $title = is_callable( array( $skin, 'getTitle' ) ) ?
$skin->getTitle() : $skin->mTitle;
- $content_actions['purge'] = array(
- 'class' => false,
- 'text' => wfMsg( 'smw_purge' ),
- 'href' => $title->getLocalUrl( 'action=purge' )
- );
- }
- return true; // always return true, in order not to stop MW's hook
processing!
-}
-
-/**
- * Adds the refresh action like smwfAddRefreshTab(), but places it into
- * the structure of actions as used in new "Vector"-type skins
- */
-function smwfAddStructuredRefreshTab( $skin, &$links ) {
- $actions = $links['actions'];
- smwfAddRefreshTab( $skin, $actions );
- $links['actions'] = $actions;
- return true;
-}
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php 2012-03-20
16:24:17 UTC (rev 114278)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php 2012-03-20
16:37:58 UTC (rev 114279)
@@ -93,6 +93,9 @@
$wgHooks['ArticleFromTitle'][] = 'SMWHooks::onArticleFromTitle'; //
special implementations for property/type articles
$wgHooks['ParserFirstCallInit'][] = 'SMWHooks::onParserFirstCallInit';
+ $wgHooks['SkinTemplateTabs'][] = 'SMWHooks::addRefreshTab'; // basic
tab addition
+ $wgHooks['SkinTemplateNavigation'][] =
'SMWHooks::addStructuredRefreshTab'; // structured version for "Vector"-type
skins
+
if ( $GLOBALS['smwgToolboxBrowseLink'] ) {
$wgHooks['SkinTemplateToolboxEnd'][] =
'SMWHooks::showBrowseLink';
}
@@ -419,9 +422,6 @@
$smwgMasterStore = null;
$smwgIQRunningNumber = 0;
- ///// register hooks /////
- require_once( $smwgIP . 'includes/SMW_RefreshTab.php' );
-
if ( isset($wgFooterIcons["poweredby"])
&& isset($wgFooterIcons["poweredby"]["semanticmediawiki"])
&& is_null( $wgFooterIcons["poweredby"]["semanticmediawiki"]["src"] )
) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
