mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-06 16:56:44 +02:00
- added updated coding guidelines
- introduced is_registered and is_bot flags for correct determinition of guest/registered/bot users - changed bot code to act on useragent || ip git-svn-id: file:///svn/phpbb/trunk@5117 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -473,7 +473,7 @@ class queue
|
||||
@set_time_limit(60);
|
||||
|
||||
$package_size = $data_ary['package_size'];
|
||||
$num_items = (count($data_ary['data']) < $package_size) ? count($data_ary['data']) : $package_size;
|
||||
$num_items = (sizeof($data_ary['data']) < $package_size) ? sizeof($data_ary['data']) : $package_size;
|
||||
|
||||
switch ($object)
|
||||
{
|
||||
@@ -552,7 +552,7 @@ class queue
|
||||
}
|
||||
|
||||
// No more data for this object? Unset it
|
||||
if (!count($this->queue_data[$object]['data']))
|
||||
if (!sizeof($this->queue_data[$object]['data']))
|
||||
{
|
||||
unset($this->queue_data[$object]);
|
||||
}
|
||||
@@ -602,10 +602,14 @@ class queue
|
||||
|
||||
foreach ($this->queue_data as $object => $data_ary)
|
||||
{
|
||||
if (count($this->data[$object]))
|
||||
if (isset($this->data[$object]) && sizeof($this->data[$object]))
|
||||
{
|
||||
$this->data[$object]['data'] = array_merge($data_ary['data'], $this->data[$object]['data']);
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->data[$object]['data'] = $data_ary['data'];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user