View Options

	diff --git a/src/applications/metamta/contentsource/PhabricatorContentSource.php b/src/applications/metamta/contentsource/PhabricatorContentSource.php
	index ce2341186c..a1cbd061f2 100644
	--- a/src/applications/metamta/contentsource/PhabricatorContentSource.php
	+++ b/src/applications/metamta/contentsource/PhabricatorContentSource.php
	@@ -1,104 +1,104 @@
	<?php

	final class PhabricatorContentSource {

	const SOURCE_UNKNOWN = 'unknown';
	const SOURCE_WEB = 'web';
	const SOURCE_EMAIL = 'email';
	const SOURCE_CONDUIT = 'conduit';
	const SOURCE_MOBILE = 'mobile';
	const SOURCE_TABLET = 'tablet';
	const SOURCE_FAX = 'fax';
	const SOURCE_CONSOLE = 'console';
	const SOURCE_HERALD = 'herald';
	const SOURCE_LEGACY = 'legacy';
	const SOURCE_DAEMON = 'daemon';
	const SOURCE_LIPSUM = 'lipsum';
	const SOURCE_PHORTUNE = 'phortune';

	private $source;
	private $params = array();

	private function __construct() {
	// <empty>
	}

	public static function newForSource($source, array $params) {
	$obj = new PhabricatorContentSource();
	$obj->source = $source;
	$obj->params = $params;

	return $obj;
	}

	public static function newFromSerialized($serialized) {
	- $dict = phutil_json_decode($serialized);
	+ $dict = json_decode($serialized, true);
	if (!is_array($dict)) {
	$dict = array();
	}

	$obj = new PhabricatorContentSource();
	$obj->source = idx($dict, 'source', self::SOURCE_UNKNOWN);
	$obj->params = idx($dict, 'params', array());

	return $obj;
	}

	public static function newConsoleSource() {
	return self::newForSource(
	PhabricatorContentSource::SOURCE_CONSOLE,
	array());
	}

	public static function newFromRequest(AphrontRequest $request) {
	return self::newForSource(
	PhabricatorContentSource::SOURCE_WEB,
	array(
	'ip' => $request->getRemoteAddr(),
	));
	}

	public static function newFromConduitRequest(ConduitAPIRequest $request) {
	return self::newForSource(
	PhabricatorContentSource::SOURCE_CONDUIT,
	array());
	}

	public static function getSourceNameMap() {
	return array(
	self::SOURCE_WEB => pht('Web'),
	self::SOURCE_EMAIL => pht('Email'),
	self::SOURCE_CONDUIT => pht('Conduit'),
	self::SOURCE_MOBILE => pht('Mobile'),
	self::SOURCE_TABLET => pht('Tablet'),
	self::SOURCE_FAX => pht('Fax'),
	self::SOURCE_CONSOLE => pht('Console'),
	self::SOURCE_LEGACY => pht('Legacy'),
	self::SOURCE_HERALD => pht('Herald'),
	self::SOURCE_DAEMON => pht('Daemons'),
	self::SOURCE_LIPSUM => pht('Lipsum'),
	self::SOURCE_UNKNOWN => pht('Old World'),
	self::SOURCE_PHORTUNE => pht('Phortune'),
	);
	}

	public function serialize() {
	return json_encode(array(
	'source' => $this->getSource(),
	'params' => $this->getParams(),
	));
	}

	public function getSource() {
	return $this->source;
	}

	public function getParams() {
	return $this->params;
	}

	public function getParam($key, $default = null) {
	return idx($this->params, $key, $default);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 12:26 (3 w, 4 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1124554
Default Alt Text: (3 KB)

No OneTemporary
Actions

View Options

File Metadata

Event Timeline

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions