From 846a9813b23911ae2a87d87fb6fd9f188ed84dc0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 1 Oct 2012 18:02:11 -0700
Subject: here's where the heavy lifting begins - everything is likely to be
 broken for quite some time as we add location and db independence to items
 and conversations and work through the rest of the permissions and how to
 federate the buggers.

---
 update.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'update.php')

diff --git a/update.php b/update.php
index a2f836885..2c60efe3c 100644
--- a/update.php
+++ b/update.php
@@ -149,7 +149,7 @@ function update_1014() {
 			$ph = new Photo($rr['data']);
 			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));
+				$ph->store($rr['uid'],$rr['contact-id'],$rr['resource_id'],$rr['filename'],$rr['album'],6,(($rr['profile']) ? 1 : 0));
 			}
 		}
 	}
@@ -221,7 +221,7 @@ function update_1019() {
 
 function update_1020() {
 	q("ALTER TABLE `profile` DROP `showwith`");
-	q("ALTER TABLE `item` ADD `thr-parent` CHAR( 255 ) NOT NULL AFTER `parent_uri` ");
+	q("ALTER TABLE `item` ADD `thr_parent` CHAR( 255 ) NOT NULL AFTER `parent_uri` ");
 }
 
 function update_1021() {
@@ -499,7 +499,7 @@ function update_1057() {
 }
 
 function update_1058() {
-	q("ALTER TABLE `item` ADD `event-id` INT NOT NULL AFTER `resource-id` ");
+	q("ALTER TABLE `item` ADD `event-id` INT NOT NULL AFTER `resource_id` ");
 }
 
 function update_1059() {
@@ -574,7 +574,7 @@ function update_1070() {
 
 function update_1071() {
 	q("ALTER TABLE `photo` ADD INDEX ( `uid` ) ");
-	q("ALTER TABLE `photo` ADD INDEX ( `resource-id` ) ");
+	q("ALTER TABLE `photo` ADD INDEX ( `resource_id` ) ");
 	q("ALTER TABLE `photo` ADD INDEX ( `album` ) ");
 	q("ALTER TABLE `photo` ADD INDEX ( `scale` ) ");
 	q("ALTER TABLE `photo` ADD INDEX ( `profile` ) ");
@@ -686,13 +686,13 @@ function update_1082() {
 	$r = q("select `id` from `photo` where `guid` != '' limit 1");
 	if($r && count($r))
 		return;
-	$r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`");
+	$r = q("SELECT distinct(`resource_id`) FROM `photo` WHERE 1 group by `id`");
 	if(count($r)) {
 		foreach($r as $rr) {
 			$guid = get_guid();
-			q("update `photo` set `guid` = '%s' where `resource-id` = '%s'",
+			q("update `photo` set `guid` = '%s' where `resource_id` = '%s'",
 				dbesc($guid),
-				dbesc($rr['resource-id'])
+				dbesc($rr['resource_id'])
 			);
 		}
 	}
-- 
cgit v1.2.3