X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=bc6f77dc687d0269a83e1680da40c69b37babe3d;hb=6d7781434bedda23366e6c007c15f85b80a0e073;hp=875d4a69b40ab5c48e2f07f955f6f586469ecbca;hpb=cd3a02ab8e5aa2dc56ba3939e5d480e4966b11aa;p=friendica.git

diff --git a/boot.php b/boot.php
index 875d4a69b4..bc6f77dc68 100644
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1186' );
+define ( 'FRIENDICA_VERSION',      '2.3.1195' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
-define ( 'DB_UPDATE_VERSION',      1109      );
+define ( 'DB_UPDATE_VERSION',      1111      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -21,8 +21,9 @@ define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
  *
  * Image storage quality. Lower numbers save space at cost of image detail.
  * For ease of upgrade, please do not change here. Change jpeg quality with 
- * set_config('system','jpeg_quality',n) in .htconfig.php
- * where n is netween 1 and 100, and with very poor results below about 50 
+ * $a->config['system']['jpeg_quality'] = n; 
+ * in .htconfig.php, where n is netween 1 and 100, and with very poor results 
+ * below about 50 
  *
  */
 
@@ -310,6 +311,11 @@ class App {
 		if(substr($this->cmd,0,1) === '~')
 			$this->cmd = 'profile/' . substr($this->cmd,1);
 
+		// Diaspora style profile url
+
+		if(substr($this->cmd,0,2) === 'u/')
+			$this->cmd = 'profile/' . substr($this->cmd,2);
+
 		/**
 		 *
 		 * Break the URL path into C style argc/argv style arguments for our
@@ -416,6 +422,10 @@ class App {
 	} 
 
 	function init_pagehead() {
+		$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
+		if($interval < 10000)
+			$interval = 40000;
+
 		$this->page['title'] = $this->config['sitename'];
 		$tpl = file_get_contents('view/head.tpl');
 		$this->page['htmlhead'] = replace_macros($tpl,array(
@@ -424,7 +434,8 @@ class App {
 			'$delitem' => t('Delete this item?'),
 			'$comment' => t('Comment'),
 			'$showmore' => t('show more'),
-			'$showfewer' => t('show fewer')
+			'$showfewer' => t('show fewer'),
+			'$update_interval' => $interval
 		));
 	}