This commit is contained in:
Djamil Legato
2016-08-29 23:23:21 -07:00
parent 585a64f7ac
commit dc882fffd8
7 changed files with 5 additions and 7 deletions

View File

@@ -129,4 +129,4 @@ gpm:
releases: stable # Set to either 'stable' or 'testing'
proxy_url: # Configure a manual proxy URL for GPM (eg 127.0.0.1:3128)
custom_base_url: ''
custom_base_url: ''

View File

@@ -1349,7 +1349,7 @@ class Assets
public function getTimestamp($asset = null)
{
if (is_array($asset)) {
if ($asset['remote'] == false) {
if ($asset['remote'] === false) {
if (Utils::contains($asset['asset'], '?')) {
return str_replace('?', '&', $this->timestamp);
} else {

View File

@@ -151,7 +151,7 @@ trait ParsedownGravTrait
*
* @return $this
*/
function setSpecialChars($special_chars)
public function setSpecialChars($special_chars)
{
$this->special_chars = $special_chars;

View File

@@ -2369,7 +2369,6 @@ class Page
// safety check in case page is not found
if (!isset($page)) {
return $results;
return $results;
}
// Handle a @page.descendants

View File

@@ -851,7 +851,7 @@ class Pages
$page_extension = '';
if ($pages_found and count($pages_found) > 0) {
if ($pages_found && count($pages_found) > 0) {
$page_extensions = $language->getFallbackPageExtensions();

View File

@@ -176,7 +176,6 @@ class IndexCommand extends ConsoleCommand
{
$package = isset($list[$package->slug]) ? $list[$package->slug] : $package;
$type = ucfirst(preg_replace("/s$/", '', $package->package_type));
$updatable = $this->gpm->{'is' . $type . 'Updatable'}($package->slug);
$installed = $this->gpm->{'is' . $type . 'Installed'}($package->slug);
return !$installed ? '<magenta>not installed</magenta>' : '<cyan>installed</cyan>';

View File

@@ -122,7 +122,7 @@ class UpdateCommand extends ConsoleCommand
$this->output->writeln("<red>ERROR</red>: " . Installer::lastErrorMsg());
exit;
}
if ($this->input->getOption('plugins') === false and $this->input->getOption('themes') === false) {
if ($this->input->getOption('plugins') === false && $this->input->getOption('themes') === false) {
$list_type = ['plugins' => true, 'themes' => true];
} else {
$list_type['plugins'] = $this->input->getOption('plugins');