diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-31 16:06:03 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-31 16:06:03 -0700 |
| commit | 9abd95fad3784a10fc48bc40f9b8a75d7d74edda (patch) | |
| tree | 3cf2eec6a29f384b80a8c607aa97172b84e37e62 /include/network.php | |
| parent | 256c228efd249f2ce93405db8e36f52030aa4876 (diff) | |
| download | volse-hubzilla-9abd95fad3784a10fc48bc40f9b8a75d7d74edda.tar.gz volse-hubzilla-9abd95fad3784a10fc48bc40f9b8a75d7d74edda.tar.bz2 volse-hubzilla-9abd95fad3784a10fc48bc40f9b8a75d7d74edda.zip | |
static App
Diffstat (limited to 'include/network.php')
| -rw-r--r-- | include/network.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/network.php b/include/network.php index 17e61bac5..ac14548a5 100644 --- a/include/network.php +++ b/include/network.php @@ -1856,7 +1856,7 @@ function format_and_send_email($sender,$xchan,$item) { $sender_name = t('Administrator'); - $hostname = get_app()->get_hostname(); + $hostname = App::get_hostname(); if(strpos($hostname,':')) $hostname = substr($hostname,0,strpos($hostname,':')); $sender_email = 'noreply' . '@' . $hostname; @@ -1930,11 +1930,11 @@ function get_site_info() { $admin = array(); foreach($r as $rr) { if($rr['channel_pageflags'] & PAGE_HUBADMIN) - $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . get_app()->get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']); + $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . App::get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']); } if(! $admin) { foreach($r as $rr) { - $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . get_app()->get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']); + $admin[] = array( 'name' => $rr['channel_name'], 'address' => $rr['channel_address'] . '@' . App::get_hostname(), 'channel' => z_root() . '/channel/' . $rr['channel_address']); } } } @@ -1949,7 +1949,7 @@ function get_site_info() { $service_class = false; $visible_plugins = array(); - if(is_array($a->plugins) && count($a->plugins)) { + if(is_array(App::$plugins) && count(App::$plugins)) { $r = q("select * from addon where hidden = 0"); if(count($r)) foreach($r as $rr) @@ -1989,8 +1989,8 @@ function get_site_info() { load_config('feature_lock'); $locked_features = array(); - if(is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) { - foreach($a->config['feature_lock'] as $k => $v) { + if(is_array(App::$config['feature_lock']) && count(App::$config['feature_lock'])) { + foreach(App::$config['feature_lock'] as $k => $v) { if($k === 'config_loaded') continue; $locked_features[$k] = intval($v); |