mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
- updated topic tracking code
- additional changes (mostly bugfixes) - bart, if you update your user table with the user_lastmark field, set it to the user_lastvisit value ;) - and last but not least, introducing some bugs in ucp main front (regarding topic tracking) git-svn-id: file:///svn/phpbb/trunk@5272 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -65,7 +65,7 @@ class cache extends acm
|
||||
*/
|
||||
function obtain_word_list(&$censors)
|
||||
{
|
||||
global $db, $user;
|
||||
global $config, $user, $db;
|
||||
|
||||
if (!$user->optionget('viewcensors') && $config['allow_nocensors'])
|
||||
{
|
||||
@@ -101,14 +101,14 @@ class cache extends acm
|
||||
*/
|
||||
function obtain_icons(&$icons)
|
||||
{
|
||||
global $db;
|
||||
|
||||
if ($this->exists('icons'))
|
||||
{
|
||||
$icons = $this->get('icons');
|
||||
}
|
||||
else
|
||||
{
|
||||
global $db;
|
||||
|
||||
// Topic icons
|
||||
$sql = 'SELECT *
|
||||
FROM ' . ICONS_TABLE . '
|
||||
@@ -136,14 +136,14 @@ class cache extends acm
|
||||
*/
|
||||
function obtain_ranks(&$ranks)
|
||||
{
|
||||
global $db;
|
||||
|
||||
if ($this->exists('ranks'))
|
||||
{
|
||||
$ranks = $this->get('ranks');
|
||||
}
|
||||
else
|
||||
{
|
||||
global $db;
|
||||
|
||||
$sql = 'SELECT *
|
||||
FROM ' . RANKS_TABLE . '
|
||||
ORDER BY rank_min DESC';
|
||||
@@ -181,14 +181,14 @@ class cache extends acm
|
||||
*/
|
||||
function obtain_attach_extensions(&$extensions, $forum_id = false)
|
||||
{
|
||||
global $db;
|
||||
|
||||
if ($this->exists('extensions'))
|
||||
if ($this->exists('_extensions'))
|
||||
{
|
||||
$extensions = $this->get('extensions');
|
||||
$extensions = $this->get('_extensions');
|
||||
}
|
||||
else
|
||||
{
|
||||
global $db;
|
||||
|
||||
// The rule is to only allow those extensions defined. ;)
|
||||
$sql = 'SELECT e.extension, g.*
|
||||
FROM ' . EXTENSIONS_TABLE . ' e, ' . EXTENSION_GROUPS_TABLE . ' g
|
||||
@@ -220,7 +220,7 @@ class cache extends acm
|
||||
}
|
||||
$db->sql_freeresult($result);
|
||||
|
||||
$this->put('extensions', $extensions);
|
||||
$this->put('_extensions', $extensions);
|
||||
}
|
||||
|
||||
if ($forum_id !== false)
|
||||
@@ -265,14 +265,14 @@ class cache extends acm
|
||||
*/
|
||||
function obtain_bots(&$bots)
|
||||
{
|
||||
global $db;
|
||||
|
||||
if ($this->exists('bots'))
|
||||
{
|
||||
$bots = $this->get('bots');
|
||||
}
|
||||
else
|
||||
{
|
||||
global $db;
|
||||
|
||||
switch (SQL_LAYER)
|
||||
{
|
||||
case 'mssql':
|
||||
|
Reference in New Issue
Block a user