recaptime.dev / phorge
@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
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Revert "Remove call to undefined method DoorkeeperDAO::getObjectKey()"

Summary:
This reverts commit a039c4952f6b13f380e2df3a8989c856c87bb952.

This doesn't do what it is supposed to and probably causes bad things to happen. See more details at T15894#29636

Test Plan:
In a PHP interactive shell:

- (Run `require_once 'scripts/init/__init_script__.php'` and ignore the output buffering error to get into an environment where Phorge classes can load)
- Run `$x = new DoorkeeperExternalObject()`
- Evaluate `$x->getObjectKey()`
- See some meaningless string of characters.
- Run `$x->setObjectKey('foo');`
- Evaluate `$x->getObjectKey()`
- With this patch, see `foo`. Without this patch see the same meaningless string of characters you saw above.

Beyond that extremely-low-level test, unclear.

Reviewers: O1 Blessed Committers, aklapper

Reviewed By: O1 Blessed Committers, aklapper

Subscribers: aklapper, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Differential Revision: https://we.phorge.it/D26656

Pppery aceebaa4 7d2df6c3

+5 -1
+5 -1
src/applications/doorkeeper/storage/DoorkeeperExternalObject.php
··· 60 60 } 61 61 62 62 public function getObjectKey() { 63 - return $this->getRef()->getObjectKey(); 63 + $key = parent::getObjectKey(); 64 + if ($key === null) { 65 + $key = $this->getRef()->getObjectKey(); 66 + } 67 + return $key; 64 68 } 65 69 66 70 public function getRef() {