Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

Conflicts:
	wp-fdroid/wp-fdroid.php
This commit is contained in:
Hans-Emil Skogh 2012-01-21 11:17:43 +01:00
commit 08c272b93d
19 changed files with 680 additions and 607 deletions

View file

@ -103,7 +103,9 @@ class FDroid
function get_app($query_vars) {
global $permissions_data;
$permissions_object = new AndroidPermissions($this->site_path.'/repo/AndroidManifest.xml', $this->site_path.'/repo/strings.xml', $this->site_path.'/repo/android-permissions.cache');
$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();
$xml = simplexml_load_file($this->site_path.'/repo/index.xml');