Merge remote branch 'origin/master'

Did some manual formatting changes to wp-fdroid. Should be normalized...

diff --cc wp-fdroid/wp-fdroid.php
index 7d1b1dfc0fd641ebe8b0828f6cecbcd20dc9a793,ea9aa95db1b91a54de502e233b894fb3037c9caf..2168d76c055e13833a7374f26384e67ee4d620c2
--- 1/wp-fdroid/wp-fdroid.php
--- 2/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@@ -66,35 -66,35 +66,35 @@@ class FDroi
          global $wp_query,$wp_rewrite;\r
          $this->lazyinit();\r
  \r
-               \r
 -                \r
 -                // Init local query vars\r
 -                foreach($this->queryvars(array()) as $qv) {\r
 -                        if(array_key_exists($qv,$wp_query->query_vars)) {\r
 -                                $query_vars[$qv] = $wp_query->query_vars[$qv];\r
 -                        } else {\r
 -                                $query_vars[$qv] = null;\r
 -                        }\r
 -                }\r
 -        \r
 -                // Santiy check query vars\r
 -                if(!isset($query_vars['fdpage']) || !is_numeric($query_vars['fdpage']) || $query_vars['fdpage'] <= 0) {\r
 -                        $query_vars['fdpage'] = 1;\r
 -                }\r
 -\r
 -                $out = '';\r
 -\r
 -                if(isset($attribs['search']) && $query_vars['fdfilter']===null) {\r
 -                        $query_vars['fdfilter'] = '';\r
 -                }\r
 -\r
 -                if($query_vars['fdid']!==null) {\r
 +              // Init local query vars\r
 +              foreach($this->queryvars(array()) as $qv) {\r
 +                      if(array_key_exists($qv,$wp_query->query_vars)) {\r
 +                              $query_vars[$qv] = $wp_query->query_vars[$qv];\r
 +                      } else {\r
 +                              $query_vars[$qv] = null;\r
 +                      }\r
 +              }\r
 +      \r
 +              // Santiy check query vars\r
 +              if(!isset($query_vars['fdpage']) || !is_numeric($query_vars['fdpage']) || $query_vars['fdpage'] <= 0) {\r
 +                      $query_vars['fdpage'] = 1;\r
 +              }\r
 +\r
 +              $out = '';\r
 +\r
 +              if(isset($attribs['search']) && $query_vars['fdfilter']===null) {\r
 +                      $query_vars['fdfilter'] = '';\r
 +              }\r
 +\r
 +              if($query_vars['fdid']!==null) {\r
              $out.=$this->get_app($query_vars);\r
 -                } else {\r
 -                        if($query_vars['fdfilter'] !== null)\r
 -                                $out.=$this->show_search($query_vars);\r
 +              } else {\r
 +                      if($query_vars['fdfilter'] !== null)\r
 +                              $out.=$this->show_search($query_vars);\r
  \r
              $out.=$this->get_apps($query_vars);\r
 -                }\r
 +              }\r
++
          return $out;\r
  \r
      }\r
@@@ -330,15 -330,15 +330,14 @@@
                  }\r
                  $total++;\r
              }\r
 -\r
 -        }\r
 -                \r
 -                $out.=$outputter->outputEnd();\r
 -                \r
 -                $numpages = ceil((float)$total/$outputter->perpage);\r
 -                \r
 -                return $out;\r
 -        }\r
++              }\r
 +\r
-         }\r
-               \r
 +              $out.=$outputter->outputEnd();\r
 +              \r
 +              $numpages = ceil((float)$total/$outputter->perpage);\r
 +              \r
 +              return $out;\r
 +      }\r
  }\r
  \r
  // Class to output app entries in a detailed list format\r