makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge in r9090, r9170, r9174, r9179

Browse source 
git-svn-id: file:///svn/phpbb/trunk@9214 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2008-12-23 13:53:13 +00:00
parent 79f2dedb51
commit 7e95a3ee6c
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_modules.php
View file

@ -661,6 +661,8 @@ class acp_modules
$iteration++; $iteration++;
} }
$db->sql_freeresult($result);
unset($padding_store); unset($padding_store);
return $module_list; return $module_list;

10
phpBB/includes/session.php
View file

@ -1984,7 +1984,8 @@ class user extends session
static $date_cache; static $date_cache;
$format = (!$format) ? $this->date_format : $format; $format = (!$format) ? $this->date_format : $format;
$delta = time() - $gmepoch; $now = time();
$delta = $now - $gmepoch;
if (!isset($date_cache[$format])) if (!isset($date_cache[$format]))
{ {
@ -2004,10 +2005,11 @@ class user extends session
} }
} }
// Show date < 1 hour ago as 'xx min ago' // Show date <= 1 hour ago as 'xx min ago'
if ($delta <= 3600 && $delta && $date_cache[$format]['is_short'] !== false && !$forcedate && isset($this->lang['datetime']['AGO'])) // A small tolerence is given for times in the future and times in the future but in the same minute are displayed as '< than a minute ago'
if ($delta <= 3600 && ($delta >= -5 || (($now / 60) % 60) == (($gmepoch / 60) % 60)) && $date_cache[$format]['is_short'] !== false && !$forcedate && isset($this->lang['datetime']['AGO']))
{ {
return $this->lang(array('datetime', 'AGO'), (int) floor($delta / 60)); return $this->lang(array('datetime', 'AGO'), max(0, (int) floor($delta / 60)));
} }
if (!$midnight) if (!$midnight)

2
phpBB/includes/ucp/ucp_pm_viewmessage.php
View file

@ -220,7 +220,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'S_SPECIAL_FOLDER' => in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)), 'S_SPECIAL_FOLDER' => in_array($folder_id, array(PRIVMSGS_NO_BOX, PRIVMSGS_OUTBOX)),
'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] . "&amp;view=print" : '', 'U_PRINT_PM' => ($config['print_pm'] && $auth->acl_get('u_pm_printpm')) ? "$url&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] . "&amp;view=print" : '',
'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '') 'U_FORWARD_PM' => ($config['forward_pm'] && $auth->acl_get('u_sendpm') && $auth->acl_get('u_pm_forward')) ? "$url&amp;mode=compose&amp;action=forward&amp;f=$folder_id&amp;p=" . $message_row['msg_id'] : '')
); );
// Display not already displayed Attachments for this post, we already parsed them. ;) // Display not already displayed Attachments for this post, we already parsed them. ;)

2
phpBB/styles/prosilver/template/mcp_front.html
View file

@ -129,7 +129,7 @@
</tr> </tr>
<!-- BEGINELSE --> <!-- BEGINELSE -->
<tr> <tr>
<td colspan="5">{L_NO_ENTRIES}</td> <td colspan="6">{L_NO_ENTRIES}</td>
</tr> </tr>
<!-- END log --> <!-- END log -->
</tbody> </tbody>

4
phpBB/styles/prosilver/template/memberlist_search.html
View file

@ -66,8 +66,8 @@ function insert_single(user)
<dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd> <dd><input type="text" name="aim" id="aim" value="{AIM}" class="inputbox" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="yim">{L_YIM}:</label></dt> <dt><label for="yahoo">{L_YIM}:</label></dt>
<dd><input type="text" name="yim" id="yim" value="{YIM}" class="inputbox" /></dd> <dd><input type="text" name="yahoo" id="yahoo" value="{YAHOO}" class="inputbox" /></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="msn">{L_MSNM}:</label></dt> <dt><label for="msn">{L_MSNM}:</label></dt>