Merge pull request #8 from redmatrix/master

get fresh code from HZ base

1 files changed, 34 insertions, 1 deletions

diff --git a/install/update.php b/install/update.php
index d6b543466..10ae6725e 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1158 );
+define( 'UPDATE_VERSION' , 1160 );
 
 /**
  *
@@ -1917,3 +1917,36 @@ function update_r1157() {
 }
 
 
+function update_r1158() {
+	$r = q("select attach.id, attach.data, channel_address from attach left join channel on attach.uid = channel_id where os_storage = 1 and not attach.data like '%%store%%' ");
+	if($r) {
+		foreach($r as $rr) {
+			$has_slash = ((substr($rr['data'],0,1) === '/') ? true : false);
+			q("update attach set data = '%s' where id = %d",
+				dbesc('store/' . $rr['channel_address']. (($has_slash) ? '' : '/' . $rr['data'])),
+				dbesc($rr['id'])
+			);
+		}
+	}
+	return UPDATE_SUCCESS;
+}
+
+
+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;
+}
+
+