Merge branch 'apinamespace' into 0.9.x
This commit is contained in:
		@@ -301,7 +301,7 @@ class ApiAction extends Action
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        // StatusNet-specific
 | 
					        // StatusNet-specific
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $twitter_user['statusnet:profile_url'] = $profile->profileurl;
 | 
					        $twitter_user['statusnet_profile_url'] = $profile->profileurl;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return $twitter_user;
 | 
					        return $twitter_user;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -406,7 +406,7 @@ class ApiAction extends Action
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
        // StatusNet-specific
 | 
					        // StatusNet-specific
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        $twitter_status['statusnet:html'] = $notice->rendered;
 | 
					        $twitter_status['statusnet_html'] = $notice->rendered;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return $twitter_status;
 | 
					        return $twitter_status;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
@@ -618,9 +618,13 @@ class ApiAction extends Action
 | 
				
			|||||||
                $this->showTwitterXmlStatus($value, 'retweeted_status');
 | 
					                $this->showTwitterXmlStatus($value, 'retweeted_status');
 | 
				
			||||||
                break;
 | 
					                break;
 | 
				
			||||||
            default:
 | 
					            default:
 | 
				
			||||||
 | 
					                if (strncmp($element, 'statusnet_', 10) == 0) {
 | 
				
			||||||
 | 
					                    $this->element('statusnet:'.substr($element, 10), null, $value);
 | 
				
			||||||
 | 
					                } else {
 | 
				
			||||||
                    $this->element($element, null, $value);
 | 
					                    $this->element($element, null, $value);
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
        $this->elementEnd($tag);
 | 
					        $this->elementEnd($tag);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -643,6 +647,8 @@ class ApiAction extends Action
 | 
				
			|||||||
        foreach($twitter_user as $element => $value) {
 | 
					        foreach($twitter_user as $element => $value) {
 | 
				
			||||||
            if ($element == 'status') {
 | 
					            if ($element == 'status') {
 | 
				
			||||||
                $this->showTwitterXmlStatus($twitter_user['status']);
 | 
					                $this->showTwitterXmlStatus($twitter_user['status']);
 | 
				
			||||||
 | 
					            } else if (strncmp($element, 'statusnet_', 10) == 0) {
 | 
				
			||||||
 | 
					                $this->element('statusnet:'.substr($element, 10), null, $value);
 | 
				
			||||||
            } else {
 | 
					            } else {
 | 
				
			||||||
                $this->element($element, null, $value);
 | 
					                $this->element($element, null, $value);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user