git-svn-id: file:///svn/phpbb/trunk@5257 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen 2005-10-04 21:47:20 +00:00
parent 1981196e99
commit 45e1aa45c7
2 changed files with 5 additions and 4 deletions

View file

@ -52,19 +52,20 @@ class p_master
// Sanitise for future path use, it's escaped as appropriate for queries // Sanitise for future path use, it's escaped as appropriate for queries
$this->p_class = str_replace(array('.', '/', '\\'), '', basename($p_class)); $this->p_class = str_replace(array('.', '/', '\\'), '', basename($p_class));
$sql_and = '';
if (file_exists($phpbb_root_path . 'cache/' . $this->p_class . '_modules.' . $phpEx)) if (file_exists($phpbb_root_path . 'cache/' . $this->p_class . '_modules.' . $phpEx))
{ {
include($phpbb_root_path . 'cache/' . $this->p_class . '_modules.' . $phpEx); include($phpbb_root_path . 'cache/' . $this->p_class . '_modules.' . $phpEx);
} }
/**
* @todo cache, see above. ;)
*/
$sql = 'SELECT * $sql = 'SELECT *
FROM ' . MODULES_TABLE . " FROM ' . MODULES_TABLE . "
WHERE module_class = '" . $db->sql_escape($p_class) . "' WHERE module_class = '" . $db->sql_escape($p_class) . "'
AND module_enabled = 1 AND module_enabled = 1
$sql_and
ORDER BY left_id ASC"; ORDER BY left_id ASC";
$result = $db->sql_query($sql); $result = $db->sql_query($sql, 3600);
$right = $depth = $i = 0; $right = $depth = $i = 0;
$depth_ary = array(); $depth_ary = array();

View file

@ -66,7 +66,7 @@ if (!empty($_GET['id']) && !empty($_GET['sid']))
AND t.template_id = s.template_id AND t.template_id = s.template_id
AND c.theme_id = s.theme_id AND c.theme_id = s.theme_id
AND i.imageset_id = s.imageset_id"; AND i.imageset_id = s.imageset_id";
$result2 = $db->sql_query($sql); $result2 = $db->sql_query($sql, 300);
if (!($theme = $db->sql_fetchrow($result2))) if (!($theme = $db->sql_fetchrow($result2)))
{ {