mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
commit
7d3fc0caba
@ -491,7 +491,7 @@ class DB(object):
|
|||||||
|
|
||||||
def set_user_template_functions(self, user_formatter_functions):
|
def set_user_template_functions(self, user_formatter_functions):
|
||||||
self._user_template_functions = user_formatter_functions
|
self._user_template_functions = user_formatter_functions
|
||||||
self._template_functions = formatter_functions().get_builtins().copy()
|
self._template_functions = formatter_functions().get_builtins_and_aliases().copy()
|
||||||
self._template_functions.update(user_formatter_functions)
|
self._template_functions.update(user_formatter_functions)
|
||||||
|
|
||||||
def initialize_prefs(self, default_prefs, restore_all_prefs, progress_callback): # {{{
|
def initialize_prefs(self, default_prefs, restore_all_prefs, progress_callback): # {{{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user