Merge https://github.com/friendica/red into pending_merge

3 files changed, 10 insertions, 2 deletions

diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index 1bb45b06d..a62a5e6e2 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -341,6 +341,8 @@ function dbesc_array_cb(&$item, $key) {
 	if(is_string($item)) {
 		if($item == '0000-00-00 00:00:00' && ACTIVE_DBTYPE == DBTYPE_POSTGRES)
 			$item = '0001-01-01 00:00:00';
+		else if($item == '0001-01-01 00:00:00' && ACTIVE_DBTYPE == DBTYPE_MYSQL)
+			$item = '0000-00-00 00:00:00';
 		$item = dbesc($item);
 	}
 }
diff --git a/include/items.php b/include/items.php
index 477b5197e..c488e1953 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1094,7 +1094,8 @@ function encode_item($item,$mirror = false) {
 	$x['message_parent']  = $item['thr_parent'];
 	$x['created']         = $item['created'];
 	$x['edited']          = $item['edited'];
-	$x['expires']         = $item['expires'];
+	// always send 0's over the wire
+	$x['expires']         = (($item['expires'] == '0001-01-01 00:00:00') ? '0000-00-00 00:00:00' : $item['expires']);
 	$x['commented']       = $item['commented'];
 	$x['mimetype']        = $item['mimetype'];
 	$x['title']           = $item['title'];
diff --git a/include/text.php b/include/text.php
index 22a1a78c4..ce729ac1b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1815,8 +1815,13 @@ function legal_webbie($s) {
 
 function check_webbie($arr) {
 
+	$reservechan = get_config('system','reserved_channels');
+	if(strlen($reservechan))
+		$taken = explode(',', $reservechan);
+	else
+		$taken = array();
+		
 	$str = '';
-	$taken = array();
 	if(count($arr)) {
 		foreach($arr as $x) {
 			$y = legal_webbie($x);