Merge "Revert Count API module instantiations and Hook runs"

diff --git a/includes/Hooks.php b/includes/Hooks.php
index 28c54d2..036d65c 100644 (file)
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -135,7 +135,6 @@ class Hooks {
         *   returning null) is equivalent to returning true.
         */
        public static function run( $event, array $args = array(), $deprecatedVersion = null ) {
-               RequestContext::getMain()->getStats()->increment( 'hooks.' . $event );
                foreach ( self::getHandlers( $event ) as $hook ) {
                        // Turn non-array values into an array. (Can't use casting because of objects.)
                        if ( !is_array( $hook ) ) {

diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 46dc7df..f2059d7 100644 (file)
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1090,8 +1090,6 @@ class ApiMain extends ApiBase {
                $this->checkAsserts( $params );
 
                // Execute
-               $this->getContext()->getStats()->increment(
-                       'api.modules.' . strtr( $module->getModulePath(), '+', '.' ) );
                $module->execute();
                Hooks::run( 'APIAfterExecute', array( &$module ) );