SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Merge branch 'master' of github.com:picocms/Pico

Browse Source
This commit is contained in:
Daniel Rudolf 2015-11-27 19:43:47 +01:00
commit 81138ce06a
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -19,6 +19,7 @@ Released: -
(RFC 3986) in `Page::evaluateRequestUrl()` (RFC 3986) in `Page::evaluateRequestUrl()`
* [Fixed] #272: Encode URLs using `rawurlencode()` in `Pico::getPageUrl()` * [Fixed] #272: Encode URLs using `rawurlencode()` in `Pico::getPageUrl()`
* [Fixed] #274: Prevent double slashes in `base_url` * [Fixed] #274: Prevent double slashes in `base_url`
* [Fixed] #285: Make `index.php` work when installed as a composer dependency
``` ```
### Version 1.0.0-beta.1 ### Version 1.0.0-beta.1

12
index.php
View File

@ -1,6 +1,16 @@
<?php <?php
// load dependencies // load dependencies
require_once(__DIR__ . '/vendor/autoload.php'); if(is_file($f = __DIR__ . '/vendor/autoload.php')) {
// local composer install
require_once($f);
} elseif(is_file($f = __DIR__ . '/../../../vendor/autoload.php')) {
// root composer install
require_once($f);
} else {
// composer needs install...
die('Cannot find composer `/vendor/autoload.php` -- try `composer install`');
}
// instance Pico // instance Pico
$pico = new Pico( $pico = new Pico(

5
lib/Pico.php
View File

@ -271,6 +271,11 @@ class Pico
*/ */
public function run() public function run()
{ {
// check PHP version
if (version_compare(PHP_VERSION, '5.3.6', '<')) {
die('Sorry, Pico requires PHP 5.3.6 or above to run!');
}
// lock Pico // lock Pico
$this->locked = true; $this->locked = true;