From: Michael Vogel <icarus@dabo.de>
Date: Wed, 20 Feb 2013 20:57:26 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=0d4d15c73d0bd7f571753d40937ead4c55a797b8;p=friendica.git

Merge remote-tracking branch 'upstream/master'

Conflicts:
	mod/admin.php
---

0d4d15c73d0bd7f571753d40937ead4c55a797b8
diff --cc boot.php
index 0467524f68,34d35df70d..c03eca498e
--- a/boot.php
+++ b/boot.php
@@@ -12,9 -12,10 +12,9 @@@ require_once('library/Mobile_Detect/Mob
  require_once('include/features.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_VERSION',      '3.1.1612' );
+ define ( 'FRIENDICA_VERSION',      '3.1.1614' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 -define ( 'DB_UPDATE_VERSION',      1159      );
 -
 +define ( 'DB_UPDATE_VERSION',      1162      );
  define ( 'EOL',                    "<br />\r\n"     );
  define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  
diff --cc mod/admin.php
index 19a452878b,9400a28e04..98e52d28bd
--- a/mod/admin.php
+++ b/mod/admin.php
@@@ -431,7 -440,14 +439,14 @@@ function admin_page_site(&$a) 
  		}
  	}
  
+         /* get user names to make the install a personal install of X */
+         $user_names = array();
+         $user_names['---'] = t('Multi user instance');
+         $users = q("SELECT username, nickname FROM `user`");
+         foreach ($users as $user) {
+             $user_names[$user['nickname']] = $user['username'];
+         }
 -	
 +
  	/* Banner */
  	$banner = get_config('system','banner');
  	if($banner == false)