aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-03 13:11:25 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-03 13:11:25 -0700
commit99848ab3bbc8247834551a8454088419c8a8daac (patch)
treeaa708d3872f25dab482e669cba7711686030b478
parentd1480d9f560f2d44679c76f9ecc1520b8fb2a400 (diff)
parent90d48d60d8fb038d225ec7afa3c3651ff205d58e (diff)
downloadvolse-hubzilla-99848ab3bbc8247834551a8454088419c8a8daac.tar.gz
volse-hubzilla-99848ab3bbc8247834551a8454088419c8a8daac.tar.bz2
volse-hubzilla-99848ab3bbc8247834551a8454088419c8a8daac.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rwxr-xr-xboot.php2
-rw-r--r--install/update.php29
-rw-r--r--version.inc2
3 files changed, 20 insertions, 13 deletions
diff --git a/boot.php b/boot.php
index e7ed7dcee..4dafde7f2 100755
--- a/boot.php
+++ b/boot.php
@@ -50,7 +50,7 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1151 );
+define ( 'DB_UPDATE_VERSION', 1152 );
/**
* @brief Constant with a HTML line break.
diff --git a/install/update.php b/install/update.php
index 8e531b595..0eacd73b0 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1151 );
+define( 'UPDATE_VERSION' , 1152 );
/**
*
@@ -1733,16 +1733,6 @@ function update_r1148() {
$r1 = q("alter table likes add i_mid char(255) not null default '' ");
$r2 = q("create index i_mid on likes ( i_mid ) ");
- $r3 = q("select likes.*, item.mid from from likes left join item on likes.iid = item.id");
- if($r3) {
- foreach($r3 as $rr) {
- q("update likes set i_mid = '%s' where id = $d",
- dbesc($rr['mid']),
- intval($rr['id'])
- );
- }
- }
-
if($r1 && $r2)
return UPDATE_SUCCESS;
return UPDATE_FAILED;
@@ -1798,3 +1788,20 @@ function update_r1150() {
}
+function update_r1151() {
+
+ $r3 = q("select likes.*, item.mid from likes left join item on likes.iid = item.id");
+ if($r3) {
+ foreach($r3 as $rr) {
+ q("update likes set i_mid = '%s' where id = $d",
+ dbesc($rr['mid']),
+ intval($rr['id'])
+ );
+ }
+ }
+
+ if ($r3)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+
+}
diff --git a/version.inc b/version.inc
index da2499cde..9cfd95d30 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-02.1143
+2015-09-03.1144