Revert r31505, r31510 (secureAndSplit hook).

This hook doesn't seem well thought out; a hook isn't given clean access to the various possible fields it's likely to want to manipulate, and generally feels a bit rushed.

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 979e8ab..a6f381b 100644 (file)
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1029,10 +1029,6 @@ $user: user who did the move
 $pageid: database ID of the page that's been moved
 $redirid: database ID of the created redirect
 
-'TitleSecureAndSplit': At the end of Title::secureAndSplit()
-$title: The Title object
-$dbkey: The DB key
-
 'UndeleteShowRevision': called when showing a revision in Special:Undelete
 $title: title object related to the revision
 $rev: revision (object) that will be viewed

diff --git a/includes/Title.php b/includes/Title.php
index 57d6fea..ea2b197 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2102,17 +2102,13 @@ class Title {
                        return false;
                }
                
-               # Hooks can reject titles by returning false
-               if(!wfRunHooks('TitleSecureAndSplit', array( $this, &$dbkey )))
-                       return false;
-               
                # Fill fields
                $this->mDbkeyform = $dbkey;
                $this->mUrlform = wfUrlencode( $dbkey );
 
                $this->mTextform = str_replace( '_', ' ', $dbkey );
-               
-               return true; 
+
+               return true;
        }
 
        /**