[MediaWiki-commits] [Gerrit] Re-registering onBeforePageDisplay hook - change (mediawiki...Wikibase)

2013-02-27 Thread Daniel Werner (Code Review)
Daniel Werner has submitted this change and it was merged.

Change subject: Re-registering onBeforePageDisplay hook
..


Re-registering onBeforePageDisplay hook

Change I032208726699d104c8ee76ef97e3f61b5f78f334 seems to have accidentally 
removed the
onBeforePageDisplay hook from the Wikibase.php file preventing the native 
search box
being replaced by the entity selector widget.

Change-Id: Ib515bdb8ddc01072f5965b30aa12556a6821c9e9
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
2 files changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Daniel Werner: Verified; Looks good to me, approved



diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index c1c7b88..b8213f3 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -37,9 +37,12 @@
 final class RepoHooks {
/**
 * Handler for the BeforePageDisplay hook, simply injects 
wikibase.ui.entitysearch module
+* replacing the native search box with the entity selector widget.
 *
 * @since 0.4
 *
+* @param \OutputPage $out
+* @param \Skin $skin
 * @return boolean
 */
public static function onBeforePageDisplay( \OutputPage $out, \Skin 
$skin ) {
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 2111cee..15d7d6b 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -254,7 +254,8 @@
 
 
 // Hooks
-$wgHooks['WikibaseDefaultSettings'][]  = 
'Wikibase\RepoHooks::onWikibaseDefaultSettings';
+$wgHooks['BeforePageDisplay'][]
= 'Wikibase\RepoHooks::onBeforePageDisplay';
+$wgHooks['WikibaseDefaultSettings'][]  = 
'Wikibase\RepoHooks::onWikibaseDefaultSettings';
 $wgHooks['LoadExtensionSchemaUpdates'][]   = 
'Wikibase\RepoHooks::onSchemaUpdate';
 $wgHooks['UnitTestsList'][]= 
'Wikibase\RepoHooks::registerUnitTests';
 $wgHooks['NamespaceIsMovable'][]   = 
'Wikibase\RepoHooks::onNamespaceIsMovable';

-- 
To view, visit https://gerrit.wikimedia.org/r/50915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib515bdb8ddc01072f5965b30aa12556a6821c9e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Daniel Werner daniel.wer...@wikimedia.de
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Re-registering onBeforePageDisplay hook - change (mediawiki...Wikibase)

2013-02-26 Thread Henning Snater (Code Review)
Henning Snater has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/50915


Change subject: Re-registering onBeforePageDisplay hook
..

Re-registering onBeforePageDisplay hook

Change I032208726699d104c8ee76ef97e3f61b5f78f334 seems to have accidentally 
removed the
onBeforePageDisplay hook from the Wikibase.php file preventing the native 
search box
being replaced by the entity selector widget.

Change-Id: Ib515bdb8ddc01072f5965b30aa12556a6821c9e9
---
M repo/Wikibase.hooks.php
M repo/Wikibase.php
2 files changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/15/50915/1

diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php
index c1c7b88..b8213f3 100644
--- a/repo/Wikibase.hooks.php
+++ b/repo/Wikibase.hooks.php
@@ -37,9 +37,12 @@
 final class RepoHooks {
/**
 * Handler for the BeforePageDisplay hook, simply injects 
wikibase.ui.entitysearch module
+* replacing the native search box with the entity selector widget.
 *
 * @since 0.4
 *
+* @param \OutputPage $out
+* @param \Skin $skin
 * @return boolean
 */
public static function onBeforePageDisplay( \OutputPage $out, \Skin 
$skin ) {
diff --git a/repo/Wikibase.php b/repo/Wikibase.php
index 2111cee..15d7d6b 100644
--- a/repo/Wikibase.php
+++ b/repo/Wikibase.php
@@ -254,7 +254,8 @@
 
 
 // Hooks
-$wgHooks['WikibaseDefaultSettings'][]  = 
'Wikibase\RepoHooks::onWikibaseDefaultSettings';
+$wgHooks['BeforePageDisplay'][]
= 'Wikibase\RepoHooks::onBeforePageDisplay';
+$wgHooks['WikibaseDefaultSettings'][]  = 
'Wikibase\RepoHooks::onWikibaseDefaultSettings';
 $wgHooks['LoadExtensionSchemaUpdates'][]   = 
'Wikibase\RepoHooks::onSchemaUpdate';
 $wgHooks['UnitTestsList'][]= 
'Wikibase\RepoHooks::registerUnitTests';
 $wgHooks['NamespaceIsMovable'][]   = 
'Wikibase\RepoHooks::onNamespaceIsMovable';

-- 
To view, visit https://gerrit.wikimedia.org/r/50915
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib515bdb8ddc01072f5965b30aa12556a6821c9e9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits