Merge https://github.com/redmatrix/redmatrix into pending_merge

Conflicts:
	boot.php
	install/update.php

3 files changed, 27 insertions, 8 deletions

diff --git a/boot.php b/boot.php
index 1faeaf15a..48bf54804 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,8 @@ define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')) . 'H');
 define ( 'ZOT_REVISION',            1     );
 
-define ( 'DB_UPDATE_VERSION',       1159  );
+define ( 'DB_UPDATE_VERSION',       1160  );
+
 
 /**
  * @brief Constant with a HTML line break.
diff --git a/install/update.php b/install/update.php
index 38e76afda..10ae6725e 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1159 );
+define( 'UPDATE_VERSION' , 1160 );
 
 /**
  *
@@ -1932,3 +1932,21 @@ function update_r1158() {
 }
 
 
+function update_r1159() {
+	$r = q("select attach.id, attach.data, attach.hash, channel_address from attach left join channel on attach.uid = channel_id where os_storage = 1 ");
+	if($r) {
+		foreach($r as $rr) {
+			$x = dbunescbin($rr['data']);
+			$has_slash = (($x === 'store/' . $rr['channel_address'] . '/') ? true : false); 
+			if(($x === 'store/' . $rr['channel_address']) || ($has_slash)) {
+				q("update attach set data = '%s' where id = %d",
+					dbesc('store/' . $rr['channel_address']. (($has_slash) ? '' : '/' . $rr['hash'])),
+					dbesc($rr['id'])
+				);
+			}
+		}
+	}
+	return UPDATE_SUCCESS;
+}
+
+
diff --git a/util/messages.po b/util/messages.po
index 9693476e9..f3c9782f3 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2015-10-30.1201\n"
+"Project-Id-Version: 2015-11-06.1208\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 00:04-0700\n"
+"POT-Creation-Date: 2015-11-06 00:04-0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/photo/photo_driver.php:694 ../../mod/profile_photo.php:143
+#: ../../include/photo/photo_driver.php:703 ../../mod/profile_photo.php:143
 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
 #: ../../mod/photos.php:92 ../../mod/photos.php:637
 msgid "Profile Photos"
@@ -2798,15 +2798,15 @@ msgstr ""
 msgid "Connection not found."
 msgstr ""
 
-#: ../../include/zot.php:684
+#: ../../include/zot.php:685
 msgid "Invalid data packet"
 msgstr ""
 
-#: ../../include/zot.php:700
+#: ../../include/zot.php:701
 msgid "Unable to verify channel signature"
 msgstr ""
 
-#: ../../include/zot.php:2208
+#: ../../include/zot.php:2209
 #, php-format
 msgid "Unable to verify site signature for %s"
 msgstr ""