16 files changed, 8 insertions, 3 deletions
diff --git a/boot.php b/boot.php
index 384376ec5..94f1c5342 100755
--- a/boot.php
+++ b/boot.php
@@ -45,7 +45,7 @@ require_once('include/account.php');
 
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
-define ( 'STD_VERSION',             '1.9' );
+define ( 'STD_VERSION',             '1.8' );
 define ( 'ZOT_REVISION',            1.1     );
 
 define ( 'DB_UPDATE_VERSION',       1176  );
@@ -1744,7 +1744,13 @@ function goaway($s) {
 }
 
 function shutdown() {
+<<<<<<< HEAD
+	global $db;
+	if(is_object($db) && $db->connected)
+		$db->close();
+=======
 
+>>>>>>> 1.8RC
 }
 
 /**
diff --git a/doc/context/es-es b/doc/context/es-es
deleted file mode 120000
index 6c4381495..000000000
--- a/doc/context/es-es
+++ /dev/null
@@ -1 +0,0 @@
-es
-\ No newline at end of file
diff --git a/doc/context/es/admin/logs/help.html b/doc/context/es-es/admin/logs/help.html
index 3a2ec413d..3a2ec413d 100644
--- a/doc/context/es/admin/logs/help.html
+++ b/doc/context/es-es/admin/logs/help.html
diff --git a/doc/context/es/admin/queue/help.html b/doc/context/es-es/admin/queue/help.html
index de9e6cdbb..de9e6cdbb 100644
--- a/doc/context/es/admin/queue/help.html
+++ b/doc/context/es-es/admin/queue/help.html
diff --git a/doc/context/es/admin/security/help.html b/doc/context/es-es/admin/security/help.html
index 229a91561..229a91561 100644
--- a/doc/context/es/admin/security/help.html
+++ b/doc/context/es-es/admin/security/help.html
diff --git a/doc/context/es/channel/help.html b/doc/context/es-es/channel/help.html
index 682125e27..682125e27 100644
--- a/doc/context/es/channel/help.html
+++ b/doc/context/es-es/channel/help.html
diff --git a/doc/context/es/chat/help.html b/doc/context/es-es/chat/help.html
index 94df6a1d2..94df6a1d2 100644
--- a/doc/context/es/chat/help.html
+++ b/doc/context/es-es/chat/help.html
diff --git a/doc/context/es/cloud/help.html b/doc/context/es-es/cloud/help.html
index 824fa5a94..824fa5a94 100644
--- a/doc/context/es/cloud/help.html
+++ b/doc/context/es-es/cloud/help.html
diff --git a/doc/context/es/connections/help.html b/doc/context/es-es/connections/help.html
index a0aa9cf32..a0aa9cf32 100644
--- a/doc/context/es/connections/help.html
+++ b/doc/context/es-es/connections/help.html
diff --git a/doc/context/es/connections/ifpending/help.html b/doc/context/es-es/connections/ifpending/help.html
index 84e547851..84e547851 100644
--- a/doc/context/es/connections/ifpending/help.html
+++ b/doc/context/es-es/connections/ifpending/help.html
diff --git a/doc/context/es/events/help.html b/doc/context/es-es/events/help.html
index b0ac1f9ea..b0ac1f9ea 100644
--- a/doc/context/es/events/help.html
+++ b/doc/context/es-es/events/help.html
diff --git a/doc/context/es/mail/help.html b/doc/context/es-es/mail/help.html
index 794af38a9..794af38a9 100644
--- a/doc/context/es/mail/help.html
+++ b/doc/context/es-es/mail/help.html
diff --git a/doc/context/es/network/help.html b/doc/context/es-es/network/help.html
index 082f52a49..082f52a49 100644
--- a/doc/context/es/network/help.html
+++ b/doc/context/es-es/network/help.html
diff --git a/doc/context/es/photos/help.html b/doc/context/es-es/photos/help.html
index 6623456eb..6623456eb 100644
--- a/doc/context/es/photos/help.html
+++ b/doc/context/es-es/photos/help.html
diff --git a/doc/context/es/profile/help.html b/doc/context/es-es/profile/help.html
index 28ff22499..28ff22499 100644
--- a/doc/context/es/profile/help.html
+++ b/doc/context/es-es/profile/help.html
diff --git a/include/datetime.php b/include/datetime.php
index bf58866e9..600ad6ec4 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -224,7 +224,7 @@ function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicke
 
 	$pickers = '';
 	if(!$pickdate) $pickers .= ',datepicker: false';
-	if(!$picktime) $pickers .= ',timepicker: false';
+	if(!$picktime) $pickers .= ',timepicker: false, closeOnDateSelect:true';
 
 	$extra_js = '';
 	if($minfrom != '')