github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e3052fe1cc into 56a483475b

Browse source
This commit is contained in:
Jerry Asher 2017-10-27 02:45:43 +00:00 • committed by GitHub
commit dcc685b3dd
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
pelican/contents.py Normal file → Executable file
View file

@ -340,11 +340,24 @@ class Content(object):
if hasattr(self, '_summary'): if hasattr(self, '_summary'):
return self._update_content(self._summary, siteurl) return self._update_content(self._summary, siteurl)
if self.settings['SUMMARY_MAX_LENGTH'] is None: # a page specific max summary length was found
if hasattr(self, 'summary_max_length'):
summary_max_length = getattr(self, 'summary_max_length')
if summary_max_length.upper() == 'NONE':
return self.content
else:
summary_max_length = int(summary_max_length)
return truncate_html_words(self.content, summary_max_length)
if 'SUMMARY_MAX_LENGTH' in self.settings:
summary_max_length = self.settings['SUMMARY_MAX_LENGTH']
else:
summary_max_length = None
if summary_max_length is None:
return self.content return self.content
return truncate_html_words(self.content, return truncate_html_words(self.content, summary_max_length)
self.settings['SUMMARY_MAX_LENGTH'])
@property @property
def summary(self): def summary(self):