Merge branch 'develop' into utf8mb4

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 3bce492682d16b782863a379aa432111d74e3957..ea0c57535349b902995ff7f186d93db9b8d6e9b6 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define('UPDATE_VERSION' , 1216);
+define('UPDATE_VERSION' , 1219);
 
 /**
  *
@@ -148,7 +148,7 @@ function update_1014() {
        if (dbm::is_result($r)) {
                foreach ($r as $rr) {
                        $ph = new Photo($rr['data']);
-                       if($ph->is_valid()) {
+                       if ($ph->is_valid()) {
                                $ph->scaleImage(48);
                                $ph->store($rr['uid'],$rr['contact-id'],$rr['resource-id'],$rr['filename'],$rr['album'],6,(($rr['profile']) ? 1 : 0));
                        }
@@ -308,9 +308,9 @@ function update_1030() {
 function update_1031() {
        // Repair any bad links that slipped into the item table
        $r = q("SELECT `id`, `object` FROM `item` WHERE `object` != '' ");
-       if($r && dbm::is_result($r)) {
+       if (dbm::is_result($r)) {
                foreach ($r as $rr) {
-                       if(strstr($rr['object'],'type=&quot;http')) {
+                       if (strstr($rr['object'],'type=&quot;http')) {
                                q("UPDATE `item` SET `object` = '%s' WHERE `id` = %d",
                                        dbesc(str_replace('type=&quot;http','href=&quot;http',$rr['object'])),
                                        intval($rr['id'])
@@ -326,22 +326,23 @@ function update_1032() {
 
 function update_1033() {
        q("CREATE TABLE IF NOT EXISTS `cache` (
-               `k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
-               `v` TEXT NOT NULL,
-               `updated` DATETIME NOT NULL
-               ) ENGINE = MYISAM DEFAULT CHARSET=utf8 ");
+               `k` CHAR( 255 ) NOT NULL PRIMARY KEY ,
+               `v` TEXT NOT NULL,
+               `updated` DATETIME NOT NULL
+               ) DEFAULT CHARSET=utf8 ");
 }
 
 
 function update_1034() {
 
-       // If you have any of these parent-less posts they can cause problems, and
-       // we need to delete them. You can't see them anyway.
-       // Legitimate items will usually get re-created on the next
-       // pull from the hub.
-       // But don't get rid of a post that may have just come in
-       // and may not yet have the parent id set.
-
+       /*
+        * If you have any of these parent-less posts they can cause problems, and
+        * we need to delete them. You can't see them anyway.
+        * Legitimate items will usually get re-created on the next
+        * pull from the hub.
+        * But don't get rid of a post that may have just come in
+        * and may not yet have the parent id set.
+        */
        q("DELETE FROM `item` WHERE `parent` = 0 AND `created` < UTC_TIMESTAMP() - INTERVAL 2 MINUTE");
 
 }
@@ -1671,7 +1672,7 @@ function update_1190() {
                $plugins = get_config('system','addon');
                $plugins_arr = array();
 
-               if($plugins) {
+               if ($plugins) {
                        $plugins_arr = explode(",",str_replace(" ", "",$plugins));
 
                        $idx = array_search($plugin, $plugins_arr);