mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Missing legacy constants in some cases;

Browse Source 
Featurebox empty tablerender removed when there are hidden items;
Index page (when set Welcome Message) empty tablerender removed;
This commit is contained in:
secretr
2011-12-05 15:12:56 +00:00
parent a73dc8ed10
commit a2c8e9046e
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/controllers/index/index.php
View File

@@ -179,5 +179,7 @@ class core_index_index_controller extends eController
public function actionFront() public function actionFront()
{ {
// we could notify current theme we are in front page controlled by the theme layout only... // we could notify current theme we are in front page controlled by the theme layout only...
// switch off tablerender
$this->getResponse()->setParam('render', false);
} }
} }

7
e107_plugins/featurebox/e_shortcode.php
View File

@@ -1,6 +1,6 @@
<?php <?php
/* /*
* Copyright (c) e107 Inc 2009 - e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt) * Copyright (c) e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id$ * $Id$
* *
* Featurebox shortcode batch class - shortcodes available site-wide. ie. equivalent to multiple .sc files. * Featurebox shortcode batch class - shortcodes available site-wide. ie. equivalent to multiple .sc files.
@@ -66,8 +66,11 @@ class featurebox_shortcodes // must match the plugin's folder name. ie. [PLUGIN_
$tmpl = $this->getFboxTemplate($ctemplate); $tmpl = $this->getFboxTemplate($ctemplate);
$tp = e107::getParser(); $tp = e107::getParser();
// Fix - don't use tablerender if no result (category could contain hidden items)
$ret = $this->render($category, $ctemplate, $parm);
if(empty($ret)) return '';
$ret = $tp->parseTemplate($tmpl['list_start'], true, $category).$this->render($category, $ctemplate, $parm).$tp->parseTemplate($tmpl['list_end'], true, $category); $ret = $tp->parseTemplate($tmpl['list_start'], true, $category).$ret.$tp->parseTemplate($tmpl['list_end'], true, $category);
if(isset($parm['notablestyle'])) if(isset($parm['notablestyle']))
{ {
return $ret; return $ret;

11
index.php
View File

@@ -28,13 +28,18 @@
$front->init() $front->init()
->run(); ->run();
$request = $front->getRequest();
// If not already done - define legacy constants
$request->setLegacyQstring();
$request->setLegacyPage();
$inc = $front->isLegacy(); $inc = $front->isLegacy();
if($inc) if($inc)
{ {
// last chance to set legacy env // last chance to set legacy env
$request = $front->getRequest();
$request->setLegacyQstring(); $request->populateRequestParams();
$request->setLegacyPage();
if(!is_file($inc) || !is_readable($inc)) if(!is_file($inc) || !is_readable($inc))
{ {
echo 'Bad request - destination unreachable - '.$inc; echo 'Bad request - destination unreachable - '.$inc;