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

Update inline code comments

Browse Source
This commit is contained in:
Daniel Rudolf 2015-10-01 22:52:10 +02:00
parent fbb744dd43
commit 241a52907e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Pico.php
View File

@ -309,7 +309,7 @@ class Pico
} }
/** /**
* Loads plugins from PLUGINS_DIR in alphabetical order * Loads plugins from Pico::$pluginsDir in alphabetical order
* *
* Plugin files may be prefixed by a number (e.g. 00-PicoDeprecated.php) * Plugin files may be prefixed by a number (e.g. 00-PicoDeprecated.php)
* to indicate their processing order. You MUST NOT use prefixes between * to indicate their processing order. You MUST NOT use prefixes between
@ -371,7 +371,7 @@ class Pico
} }
/** /**
* Loads the config.php from CONFIG_DIR * Loads the config.php from Pico::$configDir
* *
* @return void * @return void
*/ */

6
plugins/00-PicoDeprecated.php
View File

@ -86,15 +86,15 @@ class PicoDeprecated extends AbstractPicoPlugin
/** /**
* Triggers the deprecated event config_loaded($config), tries to read * Triggers the deprecated event config_loaded($config), tries to read
* {@path "config.php"} in Picos root dir, enables the plugins * {@path "config.php"} in Picos root dir, enables the plugins
* {@link PicoParsePagesContent} and {@link PicoExcerpt} and defines the * {@link PicoParsePagesContent} and {@link PicoExcerpt} and defines some
* deprecated constants CONTENT_DIR and CONTENT_EXT * deprecated constants (ROOT_DIR, CONTENT_DIR etc.)
* *
* @see DummyPlugin::onConfigLoaded() * @see DummyPlugin::onConfigLoaded()
*/ */
public function onConfigLoaded(&$config) public function onConfigLoaded(&$config)
{ {
if (file_exists($this->getRootDir() . 'config.php')) { if (file_exists($this->getRootDir() . 'config.php')) {
// config.php in ROOT_DIR is deprecated; use CONFIG_DIR instead // config.php in Pico::$rootDir is deprecated; use Pico::$configDir instead
$newConfig = require($this->getRootDir() . 'config.php'); $newConfig = require($this->getRootDir() . 'config.php');
if (is_array($newConfig)) { if (is_array($newConfig)) {
$config = $newConfig + $config; $config = $newConfig + $config;