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

Added 'enabled' option for summary and fixed query support in assets

Browse Source
This commit is contained in:
Sommerregen
2015-01-29 16:57:46 +01:00
parent 25c44816c0
commit a4c8c53939
2 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
system/src/Grav/Common/Assets.php
View File

@@ -193,13 +193,21 @@ class Assets
} elseif (isset($this->collections[$asset])) {
$this->add($this->collections[$asset], $priority, $pipeline);
} else {
// Get extension
$extension = pathinfo($asset, PATHINFO_EXTENSION);
// Strip query from pathinfo extension
$query_pos = strpos($extension, '?');
if ($query_pos !== FALSE) {
$extension = substr($extension, 0, $query_pos);
}
// JavaScript or CSS
$info = pathinfo($asset);
if (isset($info['extension'])) {
$ext = strtolower($info['extension']);
if ($ext === 'css') {
if (strlen($extension) > 0) {
$extension = strtolower($extension);
if ($extension === 'css') {
$this->addCss($asset, $priority, $pipeline);
} elseif ($ext === 'js') {
} elseif ($extension === 'js') {
$this->addJs($asset, $priority, $pipeline);
}
}

13
system/src/Grav/Common/Page/Page.php
View File

@@ -288,22 +288,27 @@ class Page
*/
public function summary($size = null)
{
/** @var Config $config */
$config = self::$grav['config'];
$content = $this->content();
// Return summary based on settings in site config file
if (!$config->get('site.summary.enabled', TRUE)) {
return $content;
}
// Return calculated summary based on summary divider's position
if (!$size && isset($this->summary_size)) {
return substr($content, 0, $this->summary_size);
}
// Return calculated summary based on setting in site config file
/** @var Config $config */
$config = self::$grav['config'];
if (!$size && $config->get('site.summary.size')) {
if (is_null($size) && $config->get('site.summary.size')) {
$size = $config->get('site.summary.size');
}
// Return calculated summary based on defaults
if (!$size) {
if (!is_numeric($size) || ($size < 0)) {
$size = 300;
}