joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 2.0

Browse source
This commit is contained in:
Josh Sherman 2014-10-03 11:08:50 -04:00
commit a866a1a61b
21 changed files with 84 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Resource.php
View file

@ -1,18 +1,15 @@
<?php
/**
* Resource Class File for PICKLES
*
* PHP version 5
* Resource Class
*
* Licensed under The MIT License
* Redistribution of these files must retain the above copyright notice.
*
* @author Josh Sherman <josh@gravityblvd.com>
* @copyright Copyright 2007-2014, Josh Sherman
* @license http://www.opensource.org/licenses/mit-license.html
* @package PICKLES
* @link https://github.com/joshtronic/pickles
* @link http://picklesphp.com
* @package Pickles
*/
namespace Pickles;
@ -20,7 +17,7 @@ namespace Pickles;
/**
* Resource Class
*
* This is a parent class that all PICKLES modules should be extending. Each
* This is a parent class that all Pickles modules should be extending. Each
* module can specify it's own meta data and whether or not a user must be
* properly authenticated to view the page. Currently any pages without a
* template are treated as pages being requested via AJAX and the return will
@ -362,7 +359,7 @@ class Resource extends Object
{
http_response_code($this->status);
header('Content-Type: application/json');
header('X-Powered-By: Pickles v2 - https://github.com/joshtronic/pickles');
header('X-Powered-By: Pickles v2 - https://picklesphp.com');
$meta = [
'status' => $this->status,