harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow multiple apd's per plugin dir

Browse Source
This commit is contained in:
redmatrix 2016-07-01 02:16:23 -07:00
parent e6c8de5e4c
commit bb5ec8cfb8
3 changed files with 4462 additions and 4423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Zotlabs/Lib/Apps.php
View File

@ -33,8 +33,9 @@ class Apps {
$files = glob('addon/*/*.apd'); $files = glob('addon/*/*.apd');
if($files) { if($files) {
foreach($files as $f) { foreach($files as $f) {
$n = basename($f,'.apd'); $path = explode('/',$f);
if(plugin_is_installed($n)) { $plugin = $path[1];
if(plugin_is_installed($plugin)) {
$x = self::parse_app_description($f,$translate); $x = self::parse_app_description($f,$translate);
if($x) { if($x) {
$ret[] = $x; $ret[] = $x;

2
Zotlabs/Module/Import_items.php
View File

@ -78,6 +78,8 @@ class Import_items extends \Zotlabs\Web\Controller {
// logger('import: data: ' . print_r($data,true)); // logger('import: data: ' . print_r($data,true));
// print_r($data); // print_r($data);
if(! is_array($data))
return;
if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) { if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) {
$v1 = substr($data['compatibility']['database'],-4); $v1 = substr($data['compatibility']['database'],-4);

8878
util/hmessages.po
View File

File diff suppressed because it is too large Load Diff