projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-1.0.0' into core
[platal.git]
/
classes
/
plglobals.php
diff --git
a/classes/plglobals.php
b/classes/plglobals.php
index
f614458
..
ab50d9f
100644
(file)
--- a/
classes/plglobals.php
+++ b/
classes/plglobals.php
@@
-47,7
+47,7
@@
define('DEBUG_SMARTY', 4);
*/
class PlGlobals
{
*/
class PlGlobals
{
- public $coreVersion =
'0.9.17'
;
+ public $coreVersion =
PLATAL_CORE_VERSION
;
/** Debug level.
* This is a combination of the DEBUG_ flags. As soon as at least
/** Debug level.
* This is a combination of the DEBUG_ flags. As soon as at least
@@
-92,7
+92,7
@@
class PlGlobals
*/
public function __construct(array $files)
{
*/
public function __construct(array $files)
{
- $this->spoolroot = dirname(dirname(
__FILE__
));
+ $this->spoolroot = dirname(dirname(
dirname(__FILE__)
));
$this->readConfig($files);
if (isset($_SERVER) && isset($_SERVER['SERVER_NAME'])) {
$this->readConfig($files);
if (isset($_SERVER) && isset($_SERVER['SERVER_NAME'])) {
@@
-104,6
+104,13
@@
class PlGlobals
$this->setLocale();
}
$this->setLocale();
}
+ /** Initialiase dynamic data in the object.
+ * This is te place to read data from the database if needed.
+ */
+ public function init()
+ {
+ }
+
private function readIniFile($filename)
{
$array = parse_ini_file($filename, true);
private function readIniFile($filename)
{
$array = parse_ini_file($filename, true);