Merge branch 'develop' of https://github.com/getgrav/grav-plugin-admin into develop

# Conflicts:
#	classes/controller.php
This commit is contained in:
Matias Griese
2016-01-21 09:51:35 +02:00
14 changed files with 103 additions and 107 deletions

View File

@@ -402,10 +402,7 @@ class Admin
*/
public function countPages()
{
$routable = $this->grav['pages']->all()->routable();
$modular = $this->grav['pages']->all()->modular();
return count($routable) + count($modular);
return count($this->grav['pages']->all());
}
/**