deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

SF Feature #3298820 - Only custom templates

Browse Source
This commit is contained in:
Deon George 2011-05-14 10:42:12 +10:00
parent 43ae011c0e
commit 7649b9b826
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/PageRender.php
View File

@ -331,7 +331,17 @@ class PageRender extends Visitor {
if (DEBUGTMP) printf('<font size=-2>%s:<u>%s</u></font><br />',__METHOD__,'Choosing the DEFAULT template, no other template applicable');
# Since getTemplate() returns a default template if the one we want doesnt exist, we can return $templates->getID(), it should be the default.
return $template->getID();
if ($_SESSION[APPCONFIG]->getValue('appearance','disable_default_template') AND $this->getMode() == 'creation') {
system_message(array(
'title'=>_('No available templates'),
'body'=>_('There are no available active templates for this container.'),
'type'=>'warn'));
return 'invalid';
} else
return $template->getID();
# If there is only 1 defined template, and no default available, then that is our template.
} elseif ((count($templates->getTemplates($this->getMode(),$this->getModeContainer(),true)) == 1) && ! $this->haveDefaultTemplate()) {

2
lib/TemplateRender.php
View File

@ -48,7 +48,7 @@ class TemplateRender extends PageRender {
$this->page = get_request('page','REQUEST',false,1);
if ($this->template_id) {
if ($this->template_id AND $this->template_id != 'invalid') {
if (! $this->template)
parent::accept();