Navigation

Changeset 5775

Timestamp:

06/14/08 20:25:47 (3 months ago)

Author:

gregmac

Message:

Merged revisions 5773 via svnmerge from
http://svn.freepbx.org/freepbx/trunk

........

r5773 | gregmac | 2008-06-14 23:22:02 -0400 (Sat, 14 Jun 2008) | 2 lines

Implement #2701

........

Files:

freepbx/branches/2.4
- Property svnmerge-integrated changed from /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748,5750,5758,5760,5765,5771 to /freepbx/branches/2.3:1-4129,4131,4133-4134,4136-4995,5088,5135,5140,5194 /freepbx/trunk:1-5453,5736,5739,5748,5750,5758,5760,5765,5771,5773

r4993	r5775
103	103	* // convert a complexe value to JSON notation, and send it to the browser
104	104	* $value = array('foo', 'bar', array(1, 2, 'baz'), array(3, array(4)));
	105	* header("Content-type: application/json");
105	106	* $output = $json->encode($value);
106	107	*

r5772	r5775
42	42	$response = do_reload();
43	43	$json = new Services_JSON();
	44	header("Content-type: application/json");
44	45	echo $json->encode($response);
45	46	break;