From: Hans-Emil Skogh <hansemil@gmail.com>
Date: Sat, 21 Jan 2012 10:19:46 +0000 (+0100)
Subject: Merge branch 'master' into dev
X-Git-Tag: 0.1~1063^2~2^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0b933727163ac925908f441b1ef481f7869624e9;p=fdroidserver.git

Merge branch 'master' into dev
---

0b933727163ac925908f441b1ef481f7869624e9
diff --cc wp-fdroid/wp-fdroid.php
index 935b4dcc,52ffb212..385e90c8
--- a/wp-fdroid/wp-fdroid.php
+++ b/wp-fdroid/wp-fdroid.php
@@@ -102,10 -102,12 +102,13 @@@ class FDroi
  
  
  	function get_app($query_vars) {
- 		$permissions_object = new AndroidPermissions($this->site_path.'/repo/AndroidManifest.xml', $this->site_path.'/repo/strings.xml', $this->site_path.'/repo/android-permissions.cache');
+ 		global $permissions_data;
+ 		$permissions_object = new AndroidPermissions($this->site_path.'/wp-content/plugins/wp-fdroid/AndroidManifest.xml',
+ 			$this->site_path.'/wp-content/plugins/wp-fdroid/strings.xml',
+ 			sys_get_temp_dir().'/android-permissions.cache');
  		$permissions_data = $permissions_object->get_permissions_array();
  
 +		// Get app data
  		$xml = simplexml_load_file($this->site_path.'/repo/index.xml');
  		foreach($xml->children() as $app) {