Merge "Remove unused $entryPoint from Preferences::tryFormSubmit"

diff --combined includes/Preferences.php
index ba1aae8,fc5ebf1..c85a00f
--- 1/includes/Preferences.php
--- 2/includes/Preferences.php
+++ b/includes/Preferences.php
@@@ -62,13 -62,6 +62,13 @@@ class Preferences 
                'emailaddress',
        );
  
 +      /**
 +       * @return array
 +       */
 +      static function getSaveBlacklist() {
 +              return self::$saveBlacklist;
 +      }
 +
        /**
         * @throws MWException
         * @param $user User
@@@ -1404,10 -1397,9 +1404,9 @@@
         *
         * @param $formData
         * @param $form PreferencesForm
-        * @param $entryPoint string
         * @return bool|Status|string
         */
-       static function tryFormSubmit( $formData, $form, $entryPoint = 'internal' ) {
+       static function tryFormSubmit( $formData, $form ) {
                global $wgHiddenPrefs, $wgAuth;
  
                $user = $form->getModifiedUser();
@@@ -1453,7 -1445,6 +1452,7 @@@
                                $user->setOption( $key, $value );
                        }
  
 +                      wfRunHooks( 'PreferencesFormPreSave', array( $formData, $form, $user, &$result ) );
                        $user->saveSettings();
                }
  
@@@ -1468,7 -1459,7 +1467,7 @@@
         * @return Status
         */
        public static function tryUISubmit( $formData, $form ) {
-               $res = self::tryFormSubmit( $formData, $form, 'ui' );
+               $res = self::tryFormSubmit( $formData, $form );
  
                if ( $res ) {
                        $urlOptions = array( 'success' => 1 );