Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / showapplication.php

diff --git a/actions/showapplication.php b/actions/showapplication.php
index b44dd5746a09e49f6bfbd174f45ae04af9302e09..c10883942f5f19f5377494262fdf7a5832adf08b 100644 (file)
--- a/actions/showapplication.php
+++ b/actions/showapplication.php
@@ -65,7 +65,7 @@ class ShowApplicationAction extends Action
      *
      * @return success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -101,7 +101,7 @@ class ShowApplicationAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -147,20 +147,20 @@ class ShowApplicationAction extends Action
 
         $consumer = $this->application->getConsumer();
 
-        $this->elementStart('div', 'entity_profile vcard');
+        $this->elementStart('div', 'entity_profile h-card');
         // TRANS: Header on the OAuth application page.
         $this->element('h2', null, _('Application profile'));
         if (!empty($this->application->icon)) {
             $this->element('img', array('src' => $this->application->icon,
-                                        'class' => 'photo logo entity_depiction'));
+                                        'class' => 'u-photo logo entity_depiction'));
         }
 
         $this->element('a', array('href' =>  $this->application->source_url,
-                                  'class' => 'url fn entity_fn'),
+                                  'class' => 'u-url p-name entity_fn'),
                             $this->application->name);
 
         $this->element('a', array('href' =>  $this->application->homepage,
-                                  'class' => 'url entity_org'),
+                                  'class' => 'u-url entity_org'),
                             $this->application->organization);
 
         $this->element('div',