diff options
author | Mario Vavti <mario@mariovavti.com> | 2016-06-06 14:14:40 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2016-06-06 14:14:40 +0200 |
commit | 655290b022f0443a121790ef7f0c1d4ddeecb289 (patch) | |
tree | 603e88df90c10ba5cc87d5bea90cb530459b70d0 /boot.php | |
parent | 25aded6b9b137a32d9f9ea68baf3e2102fb293e7 (diff) | |
parent | cfbd2fc85c6e428f87c5e8d529c98e3e89202f2a (diff) | |
download | volse-hubzilla-655290b022f0443a121790ef7f0c1d4ddeecb289.tar.gz volse-hubzilla-655290b022f0443a121790ef7f0c1d4ddeecb289.tar.bz2 volse-hubzilla-655290b022f0443a121790ef7f0c1d4ddeecb289.zip |
Merge branch 'sabre32' of https://github.com/redmatrix/hubzilla into sabre32
Diffstat (limited to 'boot.php')
-rwxr-xr-x | boot.php | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -783,6 +783,7 @@ class App { public static $content; public static $data = array(); public static $error = false; + public static $emojitab = false; public static $cmd; public static $argv; public static $argc; @@ -866,7 +867,7 @@ class App { /** * App constructor. */ - function init() { + public static function init() { // we'll reset this after we read our config file date_default_timezone_set('UTC'); |