Merge https://github.com/redmatrix/redmatrix into pending_merge
Conflicts: boot.php install/update.php
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user