Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-05-07 22:06:43 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' of github.com:getgrav/grav into develop

Browse Source
This commit is contained in:
Andy Miller
2014-10-08 13:24:52 -06:00
parent 8b34e7dc19 3d4fb6a7d4
commit 77f19974f5
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/src/Grav/Common/GPM/GPM.php
View File

@@ -168,7 +168,7 @@ class GPM extends Iterator
}
foreach ($this->installed['plugins'] as $slug => $plugin) {
if (!isset($repository[$slug])) {
if (!isset($repository[$slug]) || $plugin->symlink) {
continue;
}
@@ -223,7 +223,7 @@ class GPM extends Iterator
}
foreach ($this->installed['themes'] as $slug => $plugin) {
if (!isset($repository[$slug])) {
if (!isset($repository[$slug]) || $plugin->symlink) {
continue;
}

1
system/src/Grav/Common/GPM/Local/Package.php
View File

@@ -32,6 +32,7 @@ class Package
$this->blueprints->set('package_type', $package_type);
$this->blueprints->set('description_html', $html_description);
$this->blueprints->set('description_plain', strip_tags($html_description));
$this->blueprints->set('symlink', is_link(USER_DIR . $package_type . DS . $this->blueprints->name));
}
}