beenull/Pico
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #88 from NeoBlack/feature/moveConfigLoading

Browse source 
[BUGFIX] load config and call hook before the other hooks
This commit is contained in:
Gilbert Pellegrom 2013-10-23 02:07:07 -07:00
parent d35d87f3ea 3d91c03979
commit 9616d902e0
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pico.php
View file

@ -22,7 +22,11 @@ class Pico {
// Load plugins
$this->load_plugins();
$this->run_hooks('plugins_loaded');
// Load the settings
$settings = $this->get_config();
$this->run_hooks('config_loaded', array(&$settings));
// Get request url and script url
$url = '';
$request_url = (isset($_SERVER['REQUEST_URI'])) ? $_SERVER['REQUEST_URI'] : '';
@ -51,10 +55,6 @@ class Pico {
$this->run_hooks('after_404_load_content', array(&$file, &$content));
}
$this->run_hooks('after_load_content', array(&$file, &$content));
// Load the settings
$settings = $this->get_config();
$this->run_hooks('config_loaded', array(&$settings));
$meta = $this->read_file_meta($content);
$this->run_hooks('file_meta', array(&$meta));