Merge commit 'upstream/master'

Conflicts:

	include/dba.php

1 files changed, 25 insertions, 25 deletions

diff --git a/boot.php b/boot.php
index abc749493..09aabf5d8 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.1308' );
+define ( 'FRIENDICA_VERSION',      '2.3.1309' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1137      );
+define ( 'DB_UPDATE_VERSION',      1138      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -657,32 +657,32 @@ if(! function_exists('check_config')) {
 
 							// call the specific update
 
-							global $db;
-							$db->excep(TRUE);
-							try {
-								$db->beginTransaction();
+//							global $db;
+//							$db->excep(TRUE);
+//							try {
+//								$db->beginTransaction();
 								$func = 'update_' . $x;
 								$func($a);
-								$db->commit();
-							} catch(Exception $ex) {
-								$db->rollback();
-								//send the administrator an e-mail
-								$email_tpl = get_intltext_template("update_fail_eml.tpl");
-								$email_tpl = replace_macros($email_tpl, array(
-									'$sitename' => $a->config['sitename'],
-									'$siteurl' =>  $a->get_baseurl(),
-									'$update' => $x,
-									'$error' => $ex->getMessage()));
-								$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
+//								$db->commit();
+//							} catch(Exception $ex) {
+//								$db->rollback();
+//								//send the administrator an e-mail
+//								$email_tpl = get_intltext_template("update_fail_eml.tpl");
+//								$email_tpl = replace_macros($email_tpl, array(
+//									'$sitename' => $a->config['sitename'],
+//									'$siteurl' =>  $a->get_baseurl(),
+//									'$update' => $x,
+//									'$error' => $ex->getMessage()));
+//								$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
 									
-								mail($a->config['admin_email'], $subject, $text,
-										'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
-										. 'Content-type: text/plain; charset=UTF-8' . "\n"
-										. 'Content-transfer-encoding: 8bit' );
-								//try the logger
-								logger('update failed: '.$ex->getMessage().EOL);
-							}
-							$db->excep(FALSE);
+//								mail($a->config['admin_email'], $subject, $text,
+//										'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
+//										. 'Content-type: text/plain; charset=UTF-8' . "\n"
+//										. 'Content-transfer-encoding: 8bit' );
+//								//try the logger
+//								logger('update failed: '.$ex->getMessage().EOL);
+//							}
+//							$db->excep(FALSE);
 						}
 					}
 					set_config('system','build', DB_UPDATE_VERSION);