Changeset 598083

Timestamp:

09/12/2012 04:54:12 PM (13 years ago)

Author:

dphiffer

Message:

Updates to page model

File:

• json-api/trunk/models/post.php (modified) (4 diffs)

json-api/trunk/models/post.php

@@ -31 +31 @@
       $this->import_wp_object($wp_post);
     }
+    do_action("json_api_{$this->type}_constructor", $this);
   }
   
@@ -149 +150 @@
     $this->set_thumbnail_value();
     $this->set_custom_fields_value();
+    $this->set_custom_taxonomies($wp_post->post_type);
+    do_action("json_api_import_wp_post", $this, $wp_post);
   }
   
@@ -245 +248 @@
     }
     $thumbnail_size = $this->get_thumbnail_size();
-    list($thumbnail) = wp_get_attachment_image_src($attachment_id, $thumbnail_size);
-    $this->thumbnail = $thumbnail;
-    
-    $attachments = $json_api->introspector->get_attachments($this->id);
-    foreach ($attachments as $attachment) {
-      if ($attachment->id == $attachment_id) {
-        $this->thumbnail_images = $attachment->images;
-        break;
-      }
-    }
+    $this->thumbnail_size = $thumbnail_size;
+    $attachment = $json_api->introspector->get_attachment($attachment_id);
+    $image = $attachment->images[$thumbnail_size];
+    $this->thumbnail = $image->url;
+    $this->thumbnail_images = $attachment->images;
   }
   
   function set_custom_fields_value() {
     global $json_api;
-    if ($json_api->include_value('custom_fields') &&
-        $json_api->query->custom_fields) {
-      $keys = explode(',', $json_api->query->custom_fields);
+    if ($json_api->include_value('custom_fields')) {
       $wp_custom_fields = get_post_custom($this->id);
       $this->custom_fields = new stdClass();
-      foreach ($keys as $key) {
-        if (isset($wp_custom_fields[$key])) {
+      if ($json_api->query->custom_fields) {
+        $keys = explode(',', $json_api->query->custom_fields);
+      }
+      foreach ($wp_custom_fields as $key => $value) {
+        if ($json_api->query->custom_fields) {
+          if (in_array($key, $keys)) {
+            $this->custom_fields->$key = $wp_custom_fields[$key];
+          }
+        } else if (substr($key, 0, 1) != '_') {
           $this->custom_fields->$key = $wp_custom_fields[$key];
         }
@@ -271 +274 @@
     } else {
       unset($this->custom_fields);
+    }
+  }
+  
+  function set_custom_taxonomies($type) {
+    global $json_api;
+    $taxonomies = get_taxonomies(array(
+      'object_type' => array($type),
+      'public'   => true,
+      '_builtin' => false
+    ));
+    foreach ($taxonomies as $taxonomy) {
+      if ($json_api->include_value($taxonomy)) {
+        $terms = get_the_terms($this->id, $taxonomy);
+        if (!empty($terms)) {
+          $this->$taxonomy = array_values($terms);
+        } else {
+          $this->$taxonomy = array();
+        }
+      }
     }
   }