@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
When a user changes to a verified primary address, mark their account as verified
Summary:
Ref T12635. See that task for discussion.
You can currently end up with a verified primary address but no "verified" flag on your account through an unusual sequence of address mutations.
Test Plan:
- Registered without verifying, using address "A".
- Added a second email address, address "B".
- Verified B (most easily with `bin/auth verify`).
- Changed my primary email to B.
- Before patch: account not verified.
- After patch: account verified.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T12635
Differential Revision: https://secure.phabricator.com/D17785
+13
-5
+5
-5
resources/celerity/map.php
+5
-5
resources/celerity/map.php
···
9
9
'names' => array(
10
10
'conpherence.pkg.css' => 'ff161f2d',
11
11
'conpherence.pkg.js' => 'b5b51108',
12
-
'core.pkg.css' => '005d943f',
12
+
'core.pkg.css' => '823f43f3',
13
13
'core.pkg.js' => '47a69358',
14
14
'darkconsole.pkg.js' => '1f9a31bc',
15
15
'differential.pkg.css' => '90b30783',
···
42
42
'rsrc/css/application/base/main-menu-view.css' => '5294060f',
43
43
'rsrc/css/application/base/notification-menu.css' => '6a697e43',
44
44
'rsrc/css/application/base/phui-theme.css' => '9f261c6b',
45
-
'rsrc/css/application/base/standard-page-view.css' => '89da5a9c',
45
+
'rsrc/css/application/base/standard-page-view.css' => 'eb5b80c5',
46
46
'rsrc/css/application/chatlog/chatlog.css' => 'd295b020',
47
47
'rsrc/css/application/conduit/conduit-api.css' => '7bc725c4',
48
48
'rsrc/css/application/config/config-options.css' => '0ede4c9b',
···
116
116
'rsrc/css/core/core.css' => '9f4cb463',
117
117
'rsrc/css/core/remarkup.css' => '17c0fb37',
118
118
'rsrc/css/core/syntax.css' => 'cae95e89',
119
-
'rsrc/css/core/z-index.css' => '5e72c4e0',
119
+
'rsrc/css/core/z-index.css' => '0233d039',
120
120
'rsrc/css/diviner/diviner-shared.css' => '896f1d43',
121
121
'rsrc/css/font/font-awesome.css' => 'e838e088',
122
122
'rsrc/css/font/font-lato.css' => 'c7ccd872',
···
809
809
'phabricator-shaped-request' => '7cbe244b',
810
810
'phabricator-slowvote-css' => 'a94b7230',
811
811
'phabricator-source-code-view-css' => '4383192f',
812
-
'phabricator-standard-page-view' => '89da5a9c',
812
+
'phabricator-standard-page-view' => 'eb5b80c5',
813
813
'phabricator-textareautils' => '320810c8',
814
814
'phabricator-title' => '485aaa6c',
815
815
'phabricator-tooltip' => '8fadb715',
···
824
824
'phabricator-uiexample-reactor-select' => 'a155550f',
825
825
'phabricator-uiexample-reactor-sendclass' => '1def2711',
826
826
'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
827
-
'phabricator-zindex-css' => '5e72c4e0',
827
+
'phabricator-zindex-css' => '0233d039',
828
828
'phame-css' => 'b3a0b3a3',
829
829
'pholio-css' => 'ca89d380',
830
830
'pholio-edit-css' => '07676f51',
+8
src/applications/people/editor/PhabricatorUserEditor.php
+8
src/applications/people/editor/PhabricatorUserEditor.php
···
540
540
$email->setIsPrimary(1);
541
541
$email->save();
542
542
543
+
// If the user doesn't have the verified flag set on their account
544
+
// yet, set it. We've made sure the email is verified above. See
545
+
// T12635 for discussion.
546
+
if (!$user->getIsEmailVerified()) {
547
+
$user->setIsEmailVerified(1);
548
+
$user->save();
549
+
}
550
+
543
551
$log = PhabricatorUserLog::initializeNewLog(
544
552
$actor,
545
553
$user->getPHID(),