Merge the html5 branch. fix #45

This commit is contained in:
Sébastien Lucas 2013-05-21 09:40:39 +02:00
commit 99f0c63a0f
18 changed files with 1130 additions and 440 deletions

View file

@ -377,8 +377,10 @@ class Page
}
} else {
array_push ($this->entryArray, Author::getCount());
array_push ($this->entryArray, Serie::getCount());
array_push ($this->entryArray, Tag::getCount());
$series = Serie::getCount();
if (!is_null ($series)) array_push ($this->entryArray, $series);
$tags = Tag::getCount();
if (!is_null ($tags)) array_push ($this->entryArray, $tags);
foreach ($config['cops_calibre_custom_column'] as $lookup) {
$customId = CustomColumn::getCustomId ($lookup);
if (!is_null ($customId)) {