Merge pull request #874 from tobiasd/20131231

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index a9c2cf1f98923e19fa34ec7aca0b79a69ee4c7b1..7dfcc5ce7b71c6b2e4f1b3d8d9130e0c4a1fe2f8 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -12,9 +12,9 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.2.1744' );
+define ( 'FRIENDICA_VERSION',      '3.2.1746' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1164      );
+define ( 'DB_UPDATE_VERSION',      1167      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 
@@ -1906,7 +1906,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;
        }