X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=72eaec8fe58db17bb87739926067901bb4e65202;hb=28df35052a452ad992ad8d67cffbfa380759e414;hp=d0f6e9d444fbc52ae0c21a74fa22e2f308789c02;hpb=3964d860201edb8a4b7c0562acfe23e4b130821c;p=friendica.git diff --git a/boot.php b/boot.php index d0f6e9d444..72eaec8fe5 100644 --- a/boot.php +++ b/boot.php @@ -14,7 +14,7 @@ require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '3.2.1745' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1165 ); +define ( 'DB_UPDATE_VERSION', 1169 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -197,6 +197,7 @@ define ( 'NOTIFY_PROFILE', 0x0040 ); define ( 'NOTIFY_TAGSELF', 0x0080 ); define ( 'NOTIFY_TAGSHARE', 0x0100 ); define ( 'NOTIFY_POKE', 0x0200 ); +define ( 'NOTIFY_SHARE', 0x0400 ); define ( 'NOTIFY_SYSTEM', 0x8000 ); @@ -395,6 +396,9 @@ if(! class_exists('App')) { // array of instanced template engines ('name'=>'instance') public $template_engine_instance = array(); + // Used for reducing load to the ostatus completion + public $last_ostatus_conversation_url; + private $ldelim = array( 'internal' => '', 'smarty3' => '{{' @@ -1906,7 +1910,11 @@ if(! function_exists('feed_birthday')) { if(! function_exists('is_site_admin')) { function is_site_admin() { $a = get_app(); - if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email'])) + + $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email'])); + + //if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email'])) + if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist)) return true; return false; }