Page MenuHomePhabricator
Files F13211354

D13574.diff
No OneTemporary
Actions

D13574.diff
View Options

diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventCancelController.php
@@ -81,40 +81,40 @@
if ($is_cancelled) {
if ($sequence || $is_parent_cancelled) {
$title = pht('Cannot Reinstate Instance');
- $paragraph = pht('Cannot reinstate an instance of a ' .
- 'cancelled recurring event.');
+ $paragraph = pht(
+ 'Cannot reinstate an instance of a cancelled recurring event.');
$cancel = pht('Cancel');
$submit = null;
} else if ($is_parent) {
$title = pht('Reinstate Recurrence');
- $paragraph = pht('Reinstate the entire series ' .
- 'of recurring events?');
- $cancel = pht('Don\'t Reinstate Recurrence');
+ $paragraph = pht(
+ 'Reinstate the entire series of recurring events?');
+ $cancel = pht("Don't Reinstate Recurrence");
$submit = pht('Reinstate Recurrence');
} else {
$title = pht('Reinstate Event');
$paragraph = pht('Reinstate this event?');
- $cancel = pht('Don\'t Reinstate Event');
+ $cancel = pht("Don't Reinstate Event");
$submit = pht('Reinstate Event');
}
} else {
if ($sequence) {
$title = pht('Cancel Instance');
- $paragraph = pht('Cancel just this instance ' .
- 'of a recurring event.');
- $cancel = pht('Don\'t Cancel Instance');
+ $paragraph = pht(
+ 'Cancel just this instance of a recurring event.');
+ $cancel = pht("Don't Cancel Instance");
$submit = pht('Cancel Instance');
} else if ($is_parent) {
$title = pht('Cancel Recurrence');
- $paragraph = pht('Cancel the entire series ' .
- 'of recurring events?');
- $cancel = pht('Don\'t Cancel Recurrence');
+ $paragraph = pht(
+ 'Cancel the entire series of recurring events?');
+ $cancel = pht("Don't Cancel Recurrence");
$submit = pht('Cancel Recurrence');
} else {
$title = pht('Cancel Event');
- $paragraph = pht('You can always reinstate ' .
- 'the event later.');
- $cancel = pht('Don\'t Cancel Event');
+ $paragraph = pht(
+ 'You can always reinstate the event later.');
+ $cancel = pht("Don't Cancel Event");
$submit = pht('Cancel Event');
}
}
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php b/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventCommentController.php
@@ -5,7 +5,6 @@
private $id;
-
public function willProcessRequest(array $data) {
$this->id = idx($data, 'id');
}
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventDragController.php b/src/applications/calendar/controller/PhabricatorCalendarEventDragController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventDragController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventDragController.php
@@ -43,13 +43,11 @@
$xactions[] = id(new PhabricatorCalendarEventTransaction())
- ->setTransactionType(
- PhabricatorCalendarEventTransaction::TYPE_START_DATE)
+ ->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_START_DATE)
->setNewValue($start_value);
$xactions[] = id(new PhabricatorCalendarEventTransaction())
- ->setTransactionType(
- PhabricatorCalendarEventTransaction::TYPE_END_DATE)
+ ->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_END_DATE)
->setNewValue($end_value);
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
@@ -302,13 +302,13 @@
} catch (PhabricatorApplicationTransactionValidationException $ex) {
$validation_exception = $ex;
$error_name = $ex->getShortMessage(
- PhabricatorCalendarEventTransaction::TYPE_NAME);
+ PhabricatorCalendarEventTransaction::TYPE_NAME);
$error_start_date = $ex->getShortMessage(
- PhabricatorCalendarEventTransaction::TYPE_START_DATE);
+ PhabricatorCalendarEventTransaction::TYPE_START_DATE);
$error_end_date = $ex->getShortMessage(
- PhabricatorCalendarEventTransaction::TYPE_END_DATE);
+ PhabricatorCalendarEventTransaction::TYPE_END_DATE);
$error_recurrence_end_date = $ex->getShortMessage(
- PhabricatorCalendarEventTransaction::TYPE_RECURRENCE_END_DATE);
+ PhabricatorCalendarEventTransaction::TYPE_RECURRENCE_END_DATE);
}
}
@@ -424,11 +424,11 @@
$recurrence_frequency_select = id(new AphrontFormSelectControl())
->setName('frequency')
->setOptions(array(
- 'daily' => pht('Daily'),
- 'weekly' => pht('Weekly'),
- 'monthly' => pht('Monthly'),
- 'yearly' => pht('Yearly'),
- ))
+ 'daily' => pht('Daily'),
+ 'weekly' => pht('Weekly'),
+ 'monthly' => pht('Monthly'),
+ 'yearly' => pht('Yearly'),
+ ))
->setValue($frequency)
->setLabel(pht('Recurring Event Frequency'))
->setID($frequency_id)
@@ -583,7 +583,7 @@
array(
$crumbs,
$object_box,
- ),
+ ),
array(
'title' => $page_title,
));
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php b/src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventJoinController.php
@@ -54,8 +54,7 @@
$new_status = array($viewer->getPHID() => $new_status);
$xaction = id(new PhabricatorCalendarEventTransaction())
- ->setTransactionType(
- PhabricatorCalendarEventTransaction::TYPE_INVITE)
+ ->setTransactionType(PhabricatorCalendarEventTransaction::TYPE_INVITE)
->setNewValue($new_status);
$editor = id(new PhabricatorCalendarEventEditor())
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -83,10 +83,10 @@
$draft = PhabricatorDraft::newFromUserAndKey($viewer, $event->getPHID());
if ($sequence) {
$comment_uri = $this->getApplicationURI(
- '/event/comment/'.$event->getID().'/'.$sequence.'/');
+ '/event/comment/'.$event->getID().'/'.$sequence.'/');
} else {
$comment_uri = $this->getApplicationURI(
- '/event/comment/'.$event->getID().'/');
+ '/event/comment/'.$event->getID().'/');
}
$add_comment_form = id(new PhabricatorApplicationTransactionCommentView())
->setUser($viewer)
@@ -372,7 +372,6 @@
$icon_display);
if (strlen($event->getDescription())) {
-
$description = PhabricatorMarkupEngine::renderOneObject(
id(new PhabricatorMarkupOneOff())->setContent($event->getDescription()),
'default',

File Metadata

Mime Type
text/plain
Expires
Sat, May 18, 5:41 AM (2 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6277603
Default Alt Text
D13574.diff (7 KB)

Event Timeline

Phabricator · Built by Phacility