http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89041
Revision: 89041
Author: ialex
Date: 2011-05-28 16:11:40 +0000 (Sat, 28 May 2011)
Log Message:
-----------
Now that Hooks.php contains a class, moved wfRunHooks() definition to
GlobalFunctions.php and removed its inclusion from Setup.php
Modified Paths:
--------------
trunk/phase3/includes/GlobalFunctions.php
trunk/phase3/includes/Hooks.php
trunk/phase3/includes/Setup.php
Modified: trunk/phase3/includes/GlobalFunctions.php
===================================================================
--- trunk/phase3/includes/GlobalFunctions.php 2011-05-28 15:59:57 UTC (rev
89040)
+++ trunk/phase3/includes/GlobalFunctions.php 2011-05-28 16:11:40 UTC (rev
89041)
@@ -3536,3 +3536,13 @@
return ObjectCache::getInstance( $wgParserCacheType );
}
+/**
+ * Call hook functions defined in $wgHooks
+ *
+ * @param $event String: event name
+ * @param $args Array: parameters passed to hook functions
+ * @return Boolean
+ */
+function wfRunHooks( $event, $args = array() ) {
+ return Hooks::run( $event, $args );
+}
Modified: trunk/phase3/includes/Hooks.php
===================================================================
--- trunk/phase3/includes/Hooks.php 2011-05-28 15:59:57 UTC (rev 89040)
+++ trunk/phase3/includes/Hooks.php 2011-05-28 16:11:40 UTC (rev 89041)
@@ -23,25 +23,6 @@
* @file
*/
-/**
- * Call hook functions defined in $wgHooks
- *
- * Because programmers assign to $wgHooks, we need to be very
- * careful about its contents. So, there's a lot more error-checking
- * in here than would normally be necessary.
- *
- * @param $event String: event name
- * @param $args Array: parameters passed to hook functions
- * @return Boolean
- */
-function wfRunHooks( $event, $args = array() ) {
- return Hooks::run( $event, $args );
-}
-
-function hookErrorHandler( $errno, $errstr ) {
- return Hooks::hookErrorHandler( $errno, $errstr );
-}
-
class MWHookException extends MWException {}
/**
Modified: trunk/phase3/includes/Setup.php
===================================================================
--- trunk/phase3/includes/Setup.php 2011-05-28 15:59:57 UTC (rev 89040)
+++ trunk/phase3/includes/Setup.php 2011-05-28 16:11:40 UTC (rev 89041)
@@ -334,7 +334,6 @@
wfProfileIn( $fname . '-includes' );
require_once( "$IP/includes/normal/UtfNormalUtil.php" );
require_once( "$IP/includes/GlobalFunctions.php" );
- require_once( "$IP/includes/Hooks.php" );
require_once( "$IP/includes/ProxyTools.php" );
require_once( "$IP/includes/ImageFunctions.php" );
require_once( "$IP/includes/normal/UtfNormalDefines.php" );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
