item table rename parent-uri, target-type, object-type (more to come later)

4 files changed, 13 insertions, 13 deletions

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 53048df6c..2c8290344 100644
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -540,9 +540,9 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 	$aside['$like_title'] = t('Last likes');
 	$aside['$like_items'] = array();
 	$r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM 
-			(SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
-				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1
-			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` 
+			(SELECT `parent_uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` 
+				FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent_uri` ORDER BY `created` DESC) AS T1
+			INNER JOIN `item` ON `item`.`uri`=`T1`.`parent_uri` 
 			WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%'
 			GROUP BY `uri`
 			ORDER BY `T1`.`created` DESC
@@ -554,10 +554,10 @@ if ($color=="dark") $color_path = "/diabook-dark/";
 		$author	 = '<a href="' . $rr['liker-link'] . '">' . $rr['liker'] . '</a>';
 		$objauthor =  '<a href="' . $rr['author-link'] . '">' . $rr['author-name'] . '</a>';
 		
-		//var_dump($rr['verb'],$rr['object-type']); killme();
+		//var_dump($rr['verb'],$rr['obj_type']); killme();
 		switch($rr['verb']){
 			case 'http://activitystrea.ms/schema/1.0/post':
-				switch ($rr['object-type']){
+				switch ($rr['obj_type']){
 					case 'http://activitystrea.ms/schema/1.0/event':
 						$post_type = t('event');
 						break;
diff --git a/view/tpl/api_timeline_atom.tpl b/view/tpl/api_timeline_atom.tpl
index fb4f51f59..9039220e7 100644
--- a/view/tpl/api_timeline_atom.tpl
+++ b/view/tpl/api_timeline_atom.tpl
@@ -10,7 +10,7 @@
  
  
  <author>
-	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
 	<uri>$user.url</uri>
 	<name>$user.name</name>
 	<link rel="alternate" type="text/html" href="$user.url"/>
@@ -31,7 +31,7 @@
 
  <!--Deprecation warning: activity:subject is present only for backward compatibility. It will be removed in the next version of StatusNet.-->
  <activity:subject>
-	<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+	<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
 	<id>$user.contact_url</id>
 	<title>$user.name</title>
 	<link rel="alternate" type="text/html" href="$user.url"/>
@@ -52,7 +52,7 @@
  
   	{{ for $statuses as $status }}
 	<entry>
-		<activity:object-type>$status.objecttype</activity:object-type>
+		<activity:obj_type>$status.objecttype</activity:obj_type>
 		<id>$status.message_id</id>
 		<title>$status.text</title>
 		<content type="html">$status.statusnet_html</content>
@@ -67,7 +67,7 @@
 		</statusnet:notice_info>
 
 		<author>
-			<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
+			<activity:obj_type>http://activitystrea.ms/schema/1.0/person</activity:obj_type>
 			<uri>$status.user.url</uri>
 			<name>$status.user.name</name>
 			<link rel="alternate" type="text/html" href="$status.user.url"/>
diff --git a/view/tpl/follow_slap.tpl b/view/tpl/follow_slap.tpl
index 0d0889f7d..1b1443bee 100644
--- a/view/tpl/follow_slap.tpl
+++ b/view/tpl/follow_slap.tpl
@@ -12,7 +12,7 @@
 		<content type="$type" >$content</content>
 
 		<as:actor>
-		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
+		<as:obj_type>http://activitystrea.ms/schema/1.0/person</as:obj_type>
 		<id>$profile_page</id>
 		<title></title>
  		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/>
diff --git a/view/tpl/tag_slap.tpl b/view/tpl/tag_slap.tpl
index 6449df496..231a13f10 100644
--- a/view/tpl/tag_slap.tpl
+++ b/view/tpl/tag_slap.tpl
@@ -12,7 +12,7 @@
 		<content type="$type" >$content</content>
 		<link rel="mentioned" href="$accturi" />
 		<as:actor>
-		<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
+		<as:obj_type>http://activitystrea.ms/schema/1.0/person</as:obj_type>
 		<id>$profile_page</id>
 		<title></title>
  		<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="$photo"/>
@@ -22,9 +22,9 @@
 		</as:actor>
  		<as:verb>$verb</as:verb>
 		<as:object>
-		<as:object-type></as:object-type>
+		<as:obj_type></as:obj_type>
 		</as:object>
 		<as:target>
-		<as:object-type></as:object-type>
+		<as:obj_type></as:obj_type>
 		</as:target>
 	</entry>