From: Hans-Emil Skogh <hansemil@gmail.com>
Date: Thu, 29 Dec 2011 18:37:05 +0000 (+0100)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: 0.1~1063^2~16
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5bf68469cb5a28aa478316a3c5b8615e296eb576;p=fdroidserver.git

Merge remote branch 'origin/master'

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

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