revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-09-20 17:28:51 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into redesign-2015

Browse source
This commit is contained in:
epriestley 2015-06-17 10:44:42 -07:00
commit 7ddaadffab
5 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/applications/calendar/query/PhabricatorCalendarEventSearchEngine.php
View file

@ -127,14 +127,14 @@ final class PhabricatorCalendarEventSearchEngine
} }
$invited_phids = $saved->getParameter('invitedPHIDs'); $invited_phids = $saved->getParameter('invitedPHIDs');
$invited_phids = $user_datasource->evaluateTokens($invited_phids);
if ($invited_phids) { if ($invited_phids) {
$invited_phids = $user_datasource->evaluateTokens($invited_phids);
$query->withInvitedPHIDs($invited_phids); $query->withInvitedPHIDs($invited_phids);
} }
$creator_phids = $saved->getParameter('creatorPHIDs'); $creator_phids = $saved->getParameter('creatorPHIDs');
$creator_phids = $user_datasource->evaluateTokens($creator_phids);
if ($creator_phids) { if ($creator_phids) {
$creator_phids = $user_datasource->evaluateTokens($creator_phids);
$query->withCreatorPHIDs($creator_phids); $query->withCreatorPHIDs($creator_phids);
} }

2
src/applications/celerity/resources/CelerityResources.php
View file

@ -5,8 +5,6 @@
*/ */
abstract class CelerityResources extends Phobject { abstract class CelerityResources extends Phobject {
private $map;
abstract public function getName(); abstract public function getName();
abstract public function getResourceData($name); abstract public function getResourceData($name);

5
src/applications/phid/storage/PhabricatorPHID.php
View file

@ -2,11 +2,6 @@
final class PhabricatorPHID extends Phobject { final class PhabricatorPHID extends Phobject {
protected $phid;
protected $phidType;
protected $ownerPHID;
protected $parentPHID;
public static function generateNewPHID($type, $subtype = null) { public static function generateNewPHID($type, $subtype = null) {
if (!$type) { if (!$type) {
throw new Exception(pht('Can not generate PHID with no type.')); throw new Exception(pht('Can not generate PHID with no type.'));

9
src/applications/spaces/query/PhabricatorSpacesNamespaceQuery.php
View file

@ -5,6 +5,7 @@ final class PhabricatorSpacesNamespaceQuery
const KEY_ALL = 'spaces.all'; const KEY_ALL = 'spaces.all';
const KEY_DEFAULT = 'spaces.default'; const KEY_DEFAULT = 'spaces.default';
const KEY_VIEWER = 'spaces.viewer';
private $ids; private $ids;
private $phids; private $phids;
@ -141,6 +142,11 @@ final class PhabricatorSpacesNamespaceQuery
} }
public static function getViewerSpaces(PhabricatorUser $viewer) { public static function getViewerSpaces(PhabricatorUser $viewer) {
$cache = PhabricatorCaches::getRequestCache();
$cache_key = self::KEY_VIEWER.'('.$viewer->getPHID().')';
$result = $cache->getKey($cache_key);
if ($result === null) {
$spaces = self::getAllSpaces(); $spaces = self::getAllSpaces();
$result = array(); $result = array();
@ -154,6 +160,9 @@ final class PhabricatorSpacesNamespaceQuery
} }
} }
$cache->setKey($cache_key, $result);
}
return $result; return $result;
} }

2
src/applications/transactions/editor/PhabricatorApplicationTransactionEditor.php
View file

@ -1058,7 +1058,7 @@ abstract class PhabricatorApplicationTransactionEditor
$mailed = array(); $mailed = array();
foreach ($messages as $mail) { foreach ($messages as $mail) {
foreach ($mail->buildRecipientList() as $phid) { foreach ($mail->buildRecipientList() as $phid) {
$mailed[$phid] = true; $mailed[$phid] = $phid;
} }
} }