Menu
▾
▴
phpbb-checkins — If you subscribed to this list, please update: code.phpbb.com
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(193) |
Nov
(393) |
Dec
(347) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(401) |
Feb
(232) |
Mar
(343) |
Apr
(129) |
May
(129) |
Jun
(116) |
Jul
(189) |
Aug
(129) |
Sep
(68) |
Oct
(172) |
Nov
(298) |
Dec
(148) |
| 2003 |
Jan
(264) |
Feb
(210) |
Mar
(322) |
Apr
(309) |
May
(234) |
Jun
(188) |
Jul
(215) |
Aug
(161) |
Sep
(234) |
Oct
(163) |
Nov
(110) |
Dec
(7) |
| 2004 |
Jan
(95) |
Feb
(107) |
Mar
(55) |
Apr
(3) |
May
(49) |
Jun
(35) |
Jul
(57) |
Aug
(43) |
Sep
(56) |
Oct
(40) |
Nov
(25) |
Dec
(21) |
| 2005 |
Jan
(93) |
Feb
(25) |
Mar
(22) |
Apr
(72) |
May
(45) |
Jun
(24) |
Jul
(29) |
Aug
(20) |
Sep
(50) |
Oct
(93) |
Nov
(69) |
Dec
(183) |
| 2006 |
Jan
(185) |
Feb
(143) |
Mar
(402) |
Apr
(260) |
May
(322) |
Jun
(367) |
Jul
(234) |
Aug
(299) |
Sep
(206) |
Oct
(288) |
Nov
(338) |
Dec
(307) |
| 2007 |
Jan
(296) |
Feb
(250) |
Mar
(261) |
Apr
(434) |
May
(539) |
Jun
(274) |
Jul
(440) |
Aug
(190) |
Sep
(128) |
Oct
(249) |
Nov
(86) |
Dec
(51) |
| 2008 |
Jan
(177) |
Feb
(67) |
Mar
(61) |
Apr
(48) |
May
(56) |
Jun
(97) |
Jul
(60) |
Aug
(64) |
Sep
(151) |
Oct
(79) |
Nov
(109) |
Dec
(123) |
| 2009 |
Jan
(70) |
Feb
(70) |
Mar
(73) |
Apr
(80) |
May
(22) |
Jun
(193) |
Jul
(191) |
Aug
(181) |
Sep
(120) |
Oct
(48) |
Nov
(24) |
Dec
|
|
From: Meik S. <acy...@ph...> - 2009-09-08 14:03:24
|
Author: acydburn
Date: Tue Sep 8 15:02:40 2009
New Revision: 10122
Log:
Always remove temporary filename (Bug #50965)
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_upload.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_upload.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_upload.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_upload.php Tue Sep 8 15:02:40 2009
***************
*** 313,324 ****
if (!@move_uploaded_file($this->filename, $this->destination_file))
{
$this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
- return false;
}
}
- @unlink($this->filename);
-
break;
case 'move':
--- 313,321 ----
***************
*** 328,339 ****
if (!@copy($this->filename, $this->destination_file))
{
$this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
- return false;
}
}
- @unlink($this->filename);
-
break;
case 'local':
--- 325,333 ----
***************
*** 341,354 ****
if (!@copy($this->filename, $this->destination_file))
{
$this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
- return false;
}
- @unlink($this->filename);
break;
}
phpbb_chmod($this->destination_file, $chmod);
}
// Try to get real filesize from destination folder
--- 335,355 ----
if (!@copy($this->filename, $this->destination_file))
{
$this->error[] = sprintf($user->lang[$this->upload->error_prefix . 'GENERAL_UPLOAD_ERROR'], $this->destination_file);
}
break;
}
+ // Remove temporary filename
+ @unlink($this->filename);
+
+ if (sizeof($this->error))
+ {
+ return false;
+ }
+
phpbb_chmod($this->destination_file, $chmod);
+ return true;
}
// Try to get real filesize from destination folder
|
|
From: Meik S. <acy...@ph...> - 2009-09-08 10:36:43
|
Author: acydburn
Date: Tue Sep 8 11:36:22 2009
New Revision: 10121
Log:
Further adjust unread tracking query, should work now for user last mark times less than forum/topic mark times.
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/includes/functions_display.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Tue Sep 8 11:36:22 2009
***************
*** 1683,1688 ****
--- 1683,1690 ----
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
// Get list of the unread topics
+ $last_mark = $user->data['user_lastmark'];
+
$sql_array = array(
'SELECT' => 't.topic_id, t.topic_last_post_time, tt.mark_time as topic_mark_time, ft.mark_time as forum_mark_time',
***************
*** 1691,1706 ****
'LEFT_JOIN' => array(
array(
'FROM' => array(TOPICS_TRACK_TABLE => 'tt'),
! 'ON' => 't.topic_id = tt.topic_id AND t.topic_last_post_time > tt.mark_time AND tt.user_id = ' . $user_id,
),
array(
'FROM' => array(FORUMS_TRACK_TABLE => 'ft'),
! 'ON' => 't.forum_id = ft.forum_id AND t.topic_last_post_time > ft.mark_time AND ft.user_id = ' . $user_id,
),
),
! 'WHERE' => "((tt.topic_id OR ft.forum_id)
! OR t.topic_last_post_time > {$user->data['user_lastmark']})
$sql_extra
$sql_sort",
);
--- 1693,1715 ----
'LEFT_JOIN' => array(
array(
'FROM' => array(TOPICS_TRACK_TABLE => 'tt'),
! 'ON' => "tt.user_id = $user_id AND t.topic_id = tt.topic_id AND tt.mark_time > $last_mark",
),
array(
'FROM' => array(FORUMS_TRACK_TABLE => 'ft'),
! 'ON' => "ft.user_id = $user_id AND t.forum_id = ft.forum_id AND ft.mark_time > $last_mark",
),
),
! 'WHERE' => "
! (
! (tt.mark_time AND t.topic_last_post_time > tt.mark_time) OR
! (tt.mark_time IS NULL AND ft.mark_time AND t.topic_last_post_time > ft.mark_time) OR
! (
! ((tt.mark_time IS NULL AND ft.mark_time IS NULL) OR (tt.mark_time < $last_mark AND ft.mark_time < $last_mark))
! AND t.topic_last_post_time > $last_mark
! )
! )
$sql_extra
$sql_sort",
);
***************
*** 1711,1718 ****
while ($row = $db->sql_fetchrow($result))
{
$topic_id = (int) $row['topic_id'];
!
! $unread_topics[$topic_id] = ($row['forum_mark_time']) ? (int) $row['forum_mark_time'] : (int) $row['topic_mark_time'];
}
$db->sql_freeresult($result);
}
--- 1720,1726 ----
while ($row = $db->sql_fetchrow($result))
{
$topic_id = (int) $row['topic_id'];
! $unread_topics[$topic_id] = ($row['topic_mark_time']) ? (int) $row['topic_mark_time'] : (($row['forum_mark_time']) ? (int) $row['forum_mark_time'] : $last_mark);
}
$db->sql_freeresult($result);
}
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_display.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_display.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_display.php Tue Sep 8 11:36:22 2009
***************
*** 107,115 ****
$ga_unread = false;
if ($root_data['forum_id'] == 0)
{
! $unread_ga_list = get_unread_topics($user->data['user_id'], 'AND t.forum_id = 0');
! if (sizeof($unread_ga_list))
{
$ga_unread = true;
}
--- 107,115 ----
$ga_unread = false;
if ($root_data['forum_id'] == 0)
{
! $unread_ga_list = get_unread_topics($user->data['user_id'], 'AND t.forum_id = 0', '', 1);
! if (!empty($unread_ga_list))
{
$ga_unread = true;
}
|
|
From: Andreas F. <ba...@ph...> - 2009-09-08 08:53:50
|
Author: bantu
Date: Tue Sep 8 09:53:01 2009
New Revision: 10120
Log:
Rename get_unread_topics_list() to get_unread_topics().
Cleanup: Remove some stuff we no longer need.
Related to report #46765
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
branches/phpBB-3_0_0/phpBB/includes/functions_display.php
branches/phpBB-3_0_0/phpBB/search.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Tue Sep 8 09:53:01 2009
***************
*** 1665,1686 ****
* @param string $sql_limit Limits the size of unread topics list, 0 for unlimited query
*
* @return array[int][int] Topic ids as keys, mark_time of topic as value
- * @author rxu
*/
! function get_unread_topics_list($user_id = false, $sql_extra = '', $sql_sort = '', $sql_limit = 1001)
{
global $config, $db, $user;
$user_id = ($user_id === false) ? (int) $user->data['user_id'] : (int) $user_id;
if (empty($sql_sort))
{
$sql_sort = 'ORDER BY t.topic_last_post_time DESC';
}
- $tracked_topics_list = $unread_topics_list = $read_topics_list = array();
- $tracked_forums_list = $mark_time = array();
-
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
// Get list of the unread topics
--- 1665,1685 ----
* @param string $sql_limit Limits the size of unread topics list, 0 for unlimited query
*
* @return array[int][int] Topic ids as keys, mark_time of topic as value
*/
! function get_unread_topics($user_id = false, $sql_extra = '', $sql_sort = '', $sql_limit = 1001)
{
global $config, $db, $user;
$user_id = ($user_id === false) ? (int) $user->data['user_id'] : (int) $user_id;
+ // Data array we're going to return
+ $unread_topics = array();
+
if (empty($sql_sort))
{
$sql_sort = 'ORDER BY t.topic_last_post_time DESC';
}
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
// Get list of the unread topics
***************
*** 1712,1718 ****
while ($row = $db->sql_fetchrow($result))
{
$topic_id = (int) $row['topic_id'];
! $unread_topics_list[$topic_id] = ($row['forum_mark_time']) ? (int) $row['forum_mark_time'] : (int) $row['topic_mark_time'];
}
$db->sql_freeresult($result);
}
--- 1711,1718 ----
while ($row = $db->sql_fetchrow($result))
{
$topic_id = (int) $row['topic_id'];
!
! $unread_topics[$topic_id] = ($row['forum_mark_time']) ? (int) $row['forum_mark_time'] : (int) $row['topic_mark_time'];
}
$db->sql_freeresult($result);
}
***************
*** 1750,1778 ****
if (isset($tracking_topics['t'][$topic_id36]))
{
! $last_read[$topic_id] = base_convert($tracking_topics['t'][$topic_id36], 36, 10) + $config['board_startdate'];
! if ($row['topic_last_post_time'] > $last_read[$topic_id])
{
! $unread_topics_list[$topic_id] = $last_read[$topic_id];
}
}
else if (isset($tracking_topics['f'][$forum_id]))
{
! $mark_time[$forum_id] = base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate'];
! if ($row['topic_last_post_time'] > $mark_time[$forum_id])
{
! $unread_topics_list[$topic_id] = $mark_time[$forum_id];
}
}
else
{
! $unread_topics_list[$topic_id] = $user_lastmark;
}
}
$db->sql_freeresult($result);
}
! return $unread_topics_list;
}
/**
--- 1750,1780 ----
if (isset($tracking_topics['t'][$topic_id36]))
{
! $last_read = base_convert($tracking_topics['t'][$topic_id36], 36, 10) + $config['board_startdate'];
!
! if ($row['topic_last_post_time'] > $last_read)
{
! $unread_topics[$topic_id] = $last_read;
}
}
else if (isset($tracking_topics['f'][$forum_id]))
{
! $mark_time = base_convert($tracking_topics['f'][$forum_id], 36, 10) + $config['board_startdate'];
!
! if ($row['topic_last_post_time'] > $mark_time)
{
! $unread_topics[$topic_id] = $mark_time;
}
}
else
{
! $unread_topics[$topic_id] = $user_lastmark;
}
}
$db->sql_freeresult($result);
}
! return $unread_topics;
}
/**
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_display.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_display.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_display.php Tue Sep 8 09:53:01 2009
***************
*** 103,114 ****
$forum_tracking_info = array();
$branch_root_id = $root_data['forum_id'];
! // Check for unread global announcements
! // For index page only we do it
$ga_unread = false;
if ($root_data['forum_id'] == 0)
{
! $unread_ga_list = get_unread_topics_list($user->data['user_id'], 'AND t.forum_id = 0');
if (sizeof($unread_ga_list))
{
$ga_unread = true;
--- 103,114 ----
$forum_tracking_info = array();
$branch_root_id = $root_data['forum_id'];
! // Check for unread global announcements (index page only)
$ga_unread = false;
if ($root_data['forum_id'] == 0)
{
! $unread_ga_list = get_unread_topics($user->data['user_id'], 'AND t.forum_id = 0');
!
if (sizeof($unread_ga_list))
{
$ga_unread = true;
Modified: branches/phpBB-3_0_0/phpBB/search.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/search.php (original)
--- branches/phpBB-3_0_0/phpBB/search.php Tue Sep 8 09:53:01 2009
***************
*** 387,393 ****
$s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = '';
$unread_list = array();
! $unread_list = get_unread_topics_list($user->data['user_id'], $sql_where, $sql_sort);
if (!empty($unread_list))
{
--- 387,393 ----
$s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = '';
$unread_list = array();
! $unread_list = get_unread_topics($user->data['user_id'], $sql_where, $sql_sort);
if (!empty($unread_list))
{
|
|
From: Joas S. <nic...@ph...> - 2009-09-08 07:59:49
|
Author: nickvergessen
Date: Tue Sep 8 08:59:03 2009
New Revision: 10119
Log:
regarding r10108 - Hide some more search links for #50685
Authorised by: AcydBurn
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_main_front.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_main_front.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_main_front.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_main_front.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_main_front.html Tue Sep 8 08:59:03 2009
***************
*** 33,39 ****
<dl class="details">
<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
<dt>{L_VISITED}:</dt> <dd>{LAST_VISIT_YOU}</dd>
! <dt>{L_TOTAL_POSTS}:</dt> <dd><!-- IF POSTS_PCT -->{POSTS} | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
<!-- IF ACTIVE_FORUM --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
<!-- IF ACTIVE_TOPIC --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}:</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->
--- 33,39 ----
<dl class="details">
<dt>{L_JOINED}:</dt> <dd>{JOINED}</dd>
<dt>{L_VISITED}:</dt> <dd>{LAST_VISIT_YOU}</dd>
! <dt>{L_TOTAL_POSTS}:</dt> <dd><!-- IF POSTS_PCT -->{POSTS}<!-- IF S_DISPLAY_SEARCH --> | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_YOUR_POSTS}</a></strong><!-- ENDIF --><br />({POSTS_DAY} / {POSTS_PCT})<!-- ELSE -->{POSTS}<!-- ENDIF --></dd>
<!-- IF ACTIVE_FORUM --><dt>{L_ACTIVE_IN_FORUM}:</dt> <dd><strong><a href="{U_ACTIVE_FORUM}">{ACTIVE_FORUM}</a></strong><br />({ACTIVE_FORUM_POSTS} / {ACTIVE_FORUM_PCT})</dd><!-- ENDIF -->
<!-- IF ACTIVE_TOPIC --><dt>{L_ACTIVE_IN_TOPIC}:</dt> <dd><strong><a href="{U_ACTIVE_TOPIC}">{ACTIVE_TOPIC}</a></strong><br />({ACTIVE_TOPIC_POSTS} / {ACTIVE_TOPIC_PCT})</dd><!-- ENDIF -->
<!-- IF WARNINGS --><dt>{L_YOUR_WARNINGS}:</dt> <dd class="error">{WARNING_IMG} [{WARNINGS}]</dd><!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_main_front.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_main_front.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/ucp_main_front.html Tue Sep 8 08:59:03 2009
***************
*** 43,49 ****
</tr>
<tr>
<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}: </b></td>
! <td><!-- IF POSTS_PCT --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<br /><a href="{U_SEARCH_SELF}">{L_SEARCH_YOUR_POSTS}</a></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td>
</tr>
<!-- IF S_SHOW_ACTIVITY -->
<tr>
--- 43,49 ----
</tr>
<tr>
<td align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap"><b class="genmed">{L_TOTAL_POSTS}: </b></td>
! <td><!-- IF POSTS_PCT --><b class="gen">{POSTS}</b><br /><span class="genmed">[{POSTS_PCT} / {POSTS_DAY}]<!-- IF S_DISPLAY_SEARCH --><br /><a href="{U_SEARCH_SELF}">{L_SEARCH_YOUR_POSTS}</a><!-- ENDIF --></span><!-- ELSE --><b class="gen">{POSTS}<b><!-- ENDIF --></td>
</tr>
<!-- IF S_SHOW_ACTIVITY -->
<tr>
|
|
From: Meik S. <acy...@ph...> - 2009-09-07 15:49:01
|
Author: acydburn
Date: Mon Sep 7 16:48:15 2009
New Revision: 10118
Log:
Fix retrieval of unread topics list. The old queries were too heavy, using temporary and filesort and actually only based on topics being retrieved before. Instead now use one query which is also a lot faster and yields the same results.
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Mon Sep 7 16:48:15 2009
***************
*** 1683,1774 ****
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
! // Get list of the unread topics - on topics tracking as the first step
! $sql = 'SELECT t.topic_id, t.topic_last_post_time, tt.mark_time
! FROM ' . TOPICS_TABLE . ' t, ' . TOPICS_TRACK_TABLE . " tt
! WHERE t.topic_id = tt.topic_id
! AND tt.user_id = $user_id
! $sql_extra
! $sql_sort";
! $result = $db->sql_query_limit($sql, $sql_limit);
!
! while ($row = $db->sql_fetchrow($result))
! {
! $topic_id = (int) $row['topic_id'];
! if ($row['topic_last_post_time'] <= $row['mark_time'])
! {
! // Check if there're read topics for the forums having unread ones
! $read_topics_list[$topic_id] = (int) $row['mark_time'];
! }
! else
! {
! $unread_topics_list[$topic_id] = (int) $row['mark_time'];
! }
! }
! $db->sql_freeresult($result);
! // Get the full list of the tracked topics and unread topics count
! $tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
! $unread_list_count = sizeof($unread_topics_list);
! if ($unread_list_count < $sql_limit)
! {
! // Get list of the unread topics - on forums tracking as the second step
! // We don't take in account topics tracked before
! $sql = 'SELECT t.topic_id, ft.mark_time
! FROM ' . TOPICS_TABLE . ' t, ' . FORUMS_TRACK_TABLE . ' ft
! WHERE t.forum_id = ft.forum_id
! AND t.topic_last_post_time > ft.mark_time
! AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . "
! AND ft.user_id = $user_id
$sql_extra
! $sql_sort";
! $result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count));
!
! while ($row = $db->sql_fetchrow($result))
! {
! $unread_topics_list[(int) $row['topic_id']] = (int) $row['mark_time'];
! }
! $db->sql_freeresult($result);
!
! // Refresh the full list of the tracked topics and unread topics count
! unset($tracked_topics_list);
! $tracked_topics_list = array_merge(array_keys($unread_topics_list), array_keys($read_topics_list));
! $unread_list_count = sizeof($unread_topics_list);
!
! if ($unread_list_count < $sql_limit)
! {
! // List of the tracked forums (not ideal, hope the better way will be found)
! // This list is to fetch later the forums user never read (fully) before
! $sql = 'SELECT forum_id
! FROM ' . FORUMS_TRACK_TABLE . "
! WHERE user_id = $user_id";
! $result = $db->sql_query($sql);
!
! while ($row = $db->sql_fetchrow($result))
! {
! $tracked_forums_list[] = (int) $row['forum_id'];
! }
! $db->sql_freeresult($result);
! // And the last step - find unread topics were not found before (that can mean a user has never read some forums)
! $sql = 'SELECT t.topic_id
! FROM ' . TOPICS_TABLE . ' t
! WHERE t.topic_last_post_time > ' . (int) $user->data['user_lastmark'] . '
! AND ' . $db->sql_in_set('t.topic_id', $tracked_topics_list, true, true) . '
! AND ' . $db->sql_in_set('t.forum_id', $tracked_forums_list, true, true) . "
! $sql_extra
! $sql_sort";
! $result = $db->sql_query_limit($sql, ($sql_limit - $unread_list_count));
! while ($row = $db->sql_fetchrow($result))
! {
! $unread_topics_list[(int) $row['topic_id']] = (int) $user->data['user_lastmark'];
! }
! $db->sql_freeresult($result);
! }
}
}
else if ($config['load_anon_lastread'] || $user->data['is_registered'])
{
--- 1683,1720 ----
if ($config['load_db_lastread'] && $user->data['is_registered'])
{
! // Get list of the unread topics
! $sql_array = array(
! 'SELECT' => 't.topic_id, t.topic_last_post_time, tt.mark_time as topic_mark_time, ft.mark_time as forum_mark_time',
! 'FROM' => array(TOPICS_TABLE => 't'),
! 'LEFT_JOIN' => array(
! array(
! 'FROM' => array(TOPICS_TRACK_TABLE => 'tt'),
! 'ON' => 't.topic_id = tt.topic_id AND t.topic_last_post_time > tt.mark_time AND tt.user_id = ' . $user_id,
! ),
! array(
! 'FROM' => array(FORUMS_TRACK_TABLE => 'ft'),
! 'ON' => 't.forum_id = ft.forum_id AND t.topic_last_post_time > ft.mark_time AND ft.user_id = ' . $user_id,
! ),
! ),
! 'WHERE' => "((tt.topic_id OR ft.forum_id)
! OR t.topic_last_post_time > {$user->data['user_lastmark']})
$sql_extra
! $sql_sort",
! );
! $sql = $db->sql_build_query('SELECT', $sql_array);
! $result = $db->sql_query_limit($sql, $sql_limit);
! while ($row = $db->sql_fetchrow($result))
! {
! $topic_id = (int) $row['topic_id'];
! $unread_topics_list[$topic_id] = ($row['forum_mark_time']) ? (int) $row['forum_mark_time'] : (int) $row['topic_mark_time'];
}
+ $db->sql_freeresult($result);
}
else if ($config['load_anon_lastread'] || $user->data['is_registered'])
{
|
|
From: Meik S. <acy...@ph...> - 2009-09-07 12:40:26
|
Author: acydburn
Date: Mon Sep 7 13:39:37 2009
New Revision: 10117
Log:
since we now have several search_ids, all with different default results modes we now always add the sr variable to the URL - Bug #50775
Modified:
branches/phpBB-3_0_0/phpBB/search.php
Modified: branches/phpBB-3_0_0/phpBB/search.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/search.php (original)
--- branches/phpBB-3_0_0/phpBB/search.php Mon Sep 7 13:39:37 2009
***************
*** 372,401 ****
break;
case 'unreadposts':
! $l_search_title = $user->lang['SEARCH_UNREAD'];
! // force sorting
! $show_results = 'topics';
! $sort_key = 't';
! $sort_by_sql['t'] = 't.topic_last_post_time';
! $sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
! $sql_where = 'AND t.topic_moved_id = 0
! ' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
! ' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '');
! gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
! $s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = '';
!
! $unread_list = array();
! $unread_list = get_unread_topics_list($user->data['user_id'], $sql_where, $sql_sort);
! if (!empty($unread_list))
! {
! $sql = 'SELECT t.topic_id
! FROM ' . TOPICS_TABLE . ' t
! WHERE ' . $db->sql_in_set('t.topic_id', array_keys($unread_list)) . "
! $sql_sort";
! $field = 'topic_id';
! }
break;
case 'newposts':
--- 372,402 ----
break;
case 'unreadposts':
! $l_search_title = $user->lang['SEARCH_UNREAD'];
! // force sorting
! $show_results = 'topics';
! $sort_key = 't';
! $sort_by_sql['t'] = 't.topic_last_post_time';
! $sql_sort = 'ORDER BY ' . $sort_by_sql[$sort_key] . (($sort_dir == 'a') ? ' ASC' : ' DESC');
! $sql_where = 'AND t.topic_moved_id = 0
! ' . str_replace(array('p.', 'post_'), array('t.', 'topic_'), $m_approve_fid_sql) . '
! ' . ((sizeof($ex_fid_ary)) ? 'AND ' . $db->sql_in_set('t.forum_id', $ex_fid_ary, true) : '');
! gen_sort_selects($limit_days, $sort_by_text, $sort_days, $sort_key, $sort_dir, $s_limit_days, $s_sort_key, $s_sort_dir, $u_sort_param);
! $s_sort_key = $s_sort_dir = $u_sort_param = $s_limit_days = '';
!
! $unread_list = array();
! $unread_list = get_unread_topics_list($user->data['user_id'], $sql_where, $sql_sort);
!
! if (!empty($unread_list))
! {
! $sql = 'SELECT t.topic_id
! FROM ' . TOPICS_TABLE . ' t
! WHERE ' . $db->sql_in_set('t.topic_id', array_keys($unread_list)) . "
! $sql_sort";
! $field = 'topic_id';
! }
break;
case 'newposts':
***************
*** 541,547 ****
$hilit = (strspn($hilit, '*') === strlen($hilit)) ? '' : $hilit;
$u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit)));
! $u_show_results = ($show_results != 'posts') ? '&sr=' . $show_results : '';
$u_search_forum = implode('&fid%5B%5D=', $search_forum);
$u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results);
--- 542,548 ----
$hilit = (strspn($hilit, '*') === strlen($hilit)) ? '' : $hilit;
$u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit)));
! $u_show_results = '&sr=' . $show_results;
$u_search_forum = implode('&fid%5B%5D=', $search_forum);
$u_search = append_sid("{$phpbb_root_path}search.$phpEx", $u_sort_param . $u_show_results);
|
Author: acydburn
Date: Mon Sep 7 12:57:58 2009
New Revision: 10116
Log:
beautify q&a captcha a bit (only slightly)
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp.html Mon Sep 7 12:57:58 2009
***************
*** 27,38 ****
</thead>
<tbody>
<!-- BEGIN questions -->
!
<!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
!
<td style="text-align: left;">{questions.QUESTION_TEXT}</td>
<td style="text-align: center;">{questions.QUESTION_LANG}</td>
! <td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a><a href="{questions.U_DELETE}">{ICON_DELETE}</a></td>
</tr>
<!-- END questions -->
</tbody>
--- 27,38 ----
</thead>
<tbody>
<!-- BEGIN questions -->
!
<!-- IF questions.S_ROW_COUNT is even --><tr class="row1"><!-- ELSE --><tr class="row2"><!-- ENDIF -->
!
<td style="text-align: left;">{questions.QUESTION_TEXT}</td>
<td style="text-align: center;">{questions.QUESTION_LANG}</td>
! <td style="text-align: center;"><a href="{questions.U_EDIT}">{ICON_EDIT}</a> <a href="{questions.U_DELETE}">{ICON_DELETE}</a></td>
</tr>
<!-- END questions -->
</tbody>
***************
*** 58,78 ****
<form id="captcha_qa" method="post" action="{U_ACTION}">
<fieldset>
<legend>{L_EDIT_QUESTION}</legend>
! <dl>
<dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
</dl>
!
! <dl>
<dt><label for="lang_iso">{L_QUESTION_LANG}</label><br /><span>{L_QUESTION_LANG_EXPLAIN}</span></dt>
<dd><select id="lang_iso" name="lang_iso"><!-- BEGIN langs --><option value="{langs.ISO}" <!-- IF langs.ISO == LANG_ISO --> selected="selected" <!-- ENDIF -->>{langs.NAME}</option><!-- END langs --></select></dd>
</dl>
! <dl>
<dt><label for="question_text">{L_QUESTION_TEXT}</label><br /><span>{L_QUESTION_TEXT_EXPLAIN}</span></dt>
<dd><input id="question_text" maxlength="255" size="60" name="question_text" type="text" value="{QUESTION_TEXT}" /></dd>
</dl>
! <dl>
<dt><label for="answers">{L_QUESTION_ANSWERS}</label><br /><span>{L_ANSWERS_EXPLAIN}</span></dt>
<dd><textarea id="answers" style="word-wrap: normal; overflow-x: scroll;" name="answers" rows="15" cols="800" >{ANSWERS}</textarea></dd>
</dl>
--- 58,78 ----
<form id="captcha_qa" method="post" action="{U_ACTION}">
<fieldset>
<legend>{L_EDIT_QUESTION}</legend>
! <dl>
<dt><label for="strict">{L_QUESTION_STRICT}:</label><br /><span>{L_QUESTION_STRICT_EXPLAIN}</span></dt>
<dd><label><input type="radio" class="radio" name="strict" value="1"<!-- IF STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_YES}</label>
<label><input type="radio" class="radio" name="strict" value="0"<!-- IF not STRICT --> id="strict" checked="checked"<!-- ENDIF --> /> {L_NO}</label></dd>
</dl>
!
! <dl>
<dt><label for="lang_iso">{L_QUESTION_LANG}</label><br /><span>{L_QUESTION_LANG_EXPLAIN}</span></dt>
<dd><select id="lang_iso" name="lang_iso"><!-- BEGIN langs --><option value="{langs.ISO}" <!-- IF langs.ISO == LANG_ISO --> selected="selected" <!-- ENDIF -->>{langs.NAME}</option><!-- END langs --></select></dd>
</dl>
! <dl>
<dt><label for="question_text">{L_QUESTION_TEXT}</label><br /><span>{L_QUESTION_TEXT_EXPLAIN}</span></dt>
<dd><input id="question_text" maxlength="255" size="60" name="question_text" type="text" value="{QUESTION_TEXT}" /></dd>
</dl>
! <dl>
<dt><label for="answers">{L_QUESTION_ANSWERS}</label><br /><span>{L_ANSWERS_EXPLAIN}</span></dt>
<dd><textarea id="answers" style="word-wrap: normal; overflow-x: scroll;" name="answers" rows="15" cols="800" >{ANSWERS}</textarea></dd>
</dl>
Modified: branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/captcha_qa_acp_demo.html Mon Sep 7 12:57:58 2009
***************
*** 2,7 ****
<dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
</dd>
</dl>
--- 2,7 ----
<dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
! <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
</dd>
</dl>
Modified: branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/captcha/plugins/phpbb_captcha_qa_plugin.php Mon Sep 7 12:57:58 2009
***************
*** 48,54 ****
{
global $config, $db, $user;
! // load our language file
$user->add_lang('captcha_qa');
// read input
--- 48,54 ----
{
global $config, $db, $user;
! // load our language file
$user->add_lang('captcha_qa');
// read input
***************
*** 62,68 ****
// try the user's lang first
$sql = 'SELECT question_id
FROM ' . CAPTCHA_QUESTIONS_TABLE . "
! WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'";
$result = $db->sql_query($sql, 3600);
while ($row = $db->sql_fetchrow($result))
--- 62,68 ----
// try the user's lang first
$sql = 'SELECT question_id
FROM ' . CAPTCHA_QUESTIONS_TABLE . "
! WHERE lang_iso = '" . $db->sql_escape($user->data['user_lang']) . "'";
$result = $db->sql_query($sql, 3600);
while ($row = $db->sql_fetchrow($result))
***************
*** 78,84 ****
$sql = 'SELECT question_id
FROM ' . CAPTCHA_QUESTIONS_TABLE . "
! WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
$result = $db->sql_query($sql, 7200);
while ($row = $db->sql_fetchrow($result))
--- 78,84 ----
$sql = 'SELECT question_id
FROM ' . CAPTCHA_QUESTIONS_TABLE . "
! WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
$result = $db->sql_query($sql, 7200);
while ($row = $db->sql_fetchrow($result))
***************
*** 139,145 ****
$sql = 'SELECT COUNT(question_id) as count
FROM ' . CAPTCHA_QUESTIONS_TABLE . "
! WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
--- 139,145 ----
$sql = 'SELECT COUNT(question_id) as count
FROM ' . CAPTCHA_QUESTIONS_TABLE . "
! WHERE lang_iso = '" . $db->sql_escape($config['default_lang']) . "'";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
***************
*** 283,289 ****
function install()
{
global $db, $phpbb_root_path, $phpEx;
!
if (!class_exists('phpbb_db_tools'))
{
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
--- 283,289 ----
function install()
{
global $db, $phpbb_root_path, $phpEx;
!
if (!class_exists('phpbb_db_tools'))
{
include("$phpbb_root_path/includes/db/db_tools.$phpEx");
***************
*** 294,334 ****
$schemas = array(
CAPTCHA_QUESTIONS_TABLE => array (
! 'COLUMNS' => array(
! 'question_id' => array('UINT', Null, 'auto_increment'),
! 'strict' => array('BOOL', 0),
! 'lang_id' => array('UINT', 0),
! 'lang_iso' => array('VCHAR:30', ''),
! 'question_text' => array('TEXT_UNI', ''),
! ),
! 'PRIMARY_KEY' => 'question_id',
! 'KEYS' => array(
! 'lang_iso' => array('INDEX', 'lang_iso'),
! ),
),
CAPTCHA_ANSWERS_TABLE => array (
! 'COLUMNS' => array(
! 'question_id' => array('UINT', 0),
! 'answer_text' => array('STEXT_UNI', ''),
! ),
! 'KEYS' => array(
! 'question_id' => array('INDEX', 'question_id'),
! ),
),
CAPTCHA_QA_CONFIRM_TABLE => array (
! 'COLUMNS' => array(
! 'session_id' => array('CHAR:32', ''),
! 'confirm_id' => array('CHAR:32', ''),
! 'lang_iso' => array('VCHAR:30', ''),
! 'question_id' => array('UINT', 0),
! 'attempts' => array('UINT', 0),
! 'confirm_type' => array('USINT', 0),
! ),
! 'KEYS' => array(
! 'session_id' => array('INDEX', 'session_id'),
! 'lookup' => array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
! ),
! 'PRIMARY_KEY' => 'confirm_id',
),
);
--- 294,334 ----
$schemas = array(
CAPTCHA_QUESTIONS_TABLE => array (
! 'COLUMNS' => array(
! 'question_id' => array('UINT', Null, 'auto_increment'),
! 'strict' => array('BOOL', 0),
! 'lang_id' => array('UINT', 0),
! 'lang_iso' => array('VCHAR:30', ''),
! 'question_text' => array('TEXT_UNI', ''),
! ),
! 'PRIMARY_KEY' => 'question_id',
! 'KEYS' => array(
! 'lang_iso' => array('INDEX', 'lang_iso'),
! ),
),
CAPTCHA_ANSWERS_TABLE => array (
! 'COLUMNS' => array(
! 'question_id' => array('UINT', 0),
! 'answer_text' => array('STEXT_UNI', ''),
! ),
! 'KEYS' => array(
! 'question_id' => array('INDEX', 'question_id'),
! ),
),
CAPTCHA_QA_CONFIRM_TABLE => array (
! 'COLUMNS' => array(
! 'session_id' => array('CHAR:32', ''),
! 'confirm_id' => array('CHAR:32', ''),
! 'lang_iso' => array('VCHAR:30', ''),
! 'question_id' => array('UINT', 0),
! 'attempts' => array('UINT', 0),
! 'confirm_type' => array('USINT', 0),
! ),
! 'KEYS' => array(
! 'session_id' => array('INDEX', 'session_id'),
! 'lookup' => array('INDEX', array('confirm_id', 'session_id', 'lang_iso')),
! ),
! 'PRIMARY_KEY' => 'confirm_id',
),
);
***************
*** 415,421 ****
$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
SET question_id = ' . (int) $this->question . "
! WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'";
$db->sql_query($sql);
--- 415,421 ----
$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
SET question_id = ' . (int) $this->question . "
! WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'";
$db->sql_query($sql);
***************
*** 436,442 ****
$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
SET question_id = ' . (int) $this->question . ",
attempts = attempts + 1
! WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'";
$db->sql_query($sql);
--- 436,442 ----
$sql = 'UPDATE ' . CAPTCHA_QA_CONFIRM_TABLE . '
SET question_id = ' . (int) $this->question . ",
attempts = attempts + 1
! WHERE confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'";
$db->sql_query($sql);
***************
*** 451,457 ****
global $db, $user;
$sql = 'SELECT con.question_id, attempts, question_text, strict
! FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes
WHERE con.question_id = qes.question_id
AND confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'
--- 451,457 ----
global $db, $user;
$sql = 'SELECT con.question_id, attempts, question_text, strict
! FROM ' . CAPTCHA_QA_CONFIRM_TABLE . ' con, ' . CAPTCHA_QUESTIONS_TABLE . " qes
WHERE con.question_id = qes.question_id
AND confirm_id = '" . $db->sql_escape($this->confirm_id) . "'
AND session_id = '" . $db->sql_escape($user->session_id) . "'
***************
*** 520,526 ****
}
/**
! * API function
*/
function get_attempt_count()
{
--- 520,526 ----
}
/**
! * API function
*/
function get_attempt_count()
{
***************
*** 528,534 ****
}
/**
! * API function
*/
function reset()
{
--- 528,534 ----
}
/**
! * API function
*/
function reset()
{
***************
*** 544,550 ****
}
/**
! * API function
*/
function is_solved()
{
--- 544,550 ----
}
/**
! * API function
*/
function is_solved()
{
***************
*** 815,821 ****
$langs = $this->get_languages();
$question_ary = $data;
!
$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
unset($question_ary['answers']);
--- 815,821 ----
$langs = $this->get_languages();
$question_ary = $data;
!
$question_ary['lang_id'] = $langs[$data['lang_iso']]['id'];
unset($question_ary['answers']);
***************
*** 862,868 ****
foreach ($tables as $table)
{
! $sql = "DELETE FROM $table
WHERE question_id = $question_id";
$db->sql_query($sql);
}
--- 862,868 ----
foreach ($tables as $table)
{
! $sql = "DELETE FROM $table
WHERE question_id = $question_id";
$db->sql_query($sql);
}
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/captcha_qa.html Mon Sep 7 12:57:58 2009
***************
*** 7,13 ****
<!-- ENDIF -->
<dl>
! <dt><label>{QA_CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
--- 7,13 ----
<!-- ENDIF -->
<dl>
! <dt><label>{QA_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd>
<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
|
|
From: Meik S. <acy...@ph...> - 2009-09-07 11:58:08
|
Author: acydburn
Date: Mon Sep 7 12:57:21 2009
New Revision: 10115
Log:
related to Bug #50185 - forgot to add tabindex to submit button on registration
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/ucp_register.html Mon Sep 7 12:57:21 2009
***************
*** 102,108 ****
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input type="reset" value="{L_RESET}" name="reset" class="button2" />
! <input type="submit" name="submit" id="submit" value="{L_SUBMIT}" class="button1 default-submit-action" />
{S_FORM_TOKEN}
</fieldset>
--- 102,108 ----
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input type="reset" value="{L_RESET}" name="reset" class="button2" />
! <input type="submit" tabindex="9" name="submit" id="submit" value="{L_SUBMIT}" class="button1 default-submit-action" />
{S_FORM_TOKEN}
</fieldset>
|
|
From: Meik S. <acy...@ph...> - 2009-09-07 11:43:14
|
Author: acydburn
Date: Mon Sep 7 12:42:30 2009
New Revision: 10114
Log:
Fix Bug #50845 (missing info icon in subsilver2)
Modified:
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_topic.php Mon Sep 7 12:42:30 2009
***************
*** 301,308 ****
'POSTS_PER_PAGE' => $posts_per_page,
'ACTION' => $action,
! 'REPORTED_IMG' => $user->img('icon_topic_reported', 'POST_REPORTED', false, true),
! 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED', false, true),
'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&start=$start",
'S_FORUM_SELECT' => ($to_forum_id) ? make_forum_select($to_forum_id, false, false, true, true, true) : make_forum_select($topic_info['forum_id'], false, false, true, true, true),
--- 301,309 ----
'POSTS_PER_PAGE' => $posts_per_page,
'ACTION' => $action,
! 'REPORTED_IMG' => $user->img('icon_topic_reported', 'POST_REPORTED'),
! 'UNAPPROVED_IMG' => $user->img('icon_topic_unapproved', 'POST_UNAPPROVED'),
! 'INFO_IMG' => $user->img('icon_post_info', 'VIEW_INFO'),
'S_MCP_ACTION' => "$url&i=$id&mode=$mode&action=$action&start=$start",
'S_FORUM_SELECT' => ($to_forum_id) ? make_forum_select($to_forum_id, false, false, true, true, true) : make_forum_select($topic_info['forum_id'], false, false, true, true, true),
|
|
From: Andreas F. <ba...@ph...> - 2009-09-07 00:40:06
|
Author: bantu
Date: Mon Sep 7 01:38:20 2009
New Revision: 10113
Log:
Adjustments to r10005: Use request_var() to get cookie data.
Some more adjustments to get_unread_topics_list()
Related to report: #46765
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions.php Mon Sep 7 01:38:20 2009
***************
*** 1671,1680 ****
{
global $config, $db, $user;
! if ($user_id === false)
! {
! $user_id = (int) $user->data['user_id'];
! }
if (empty($sql_sort))
{
--- 1671,1677 ----
{
global $config, $db, $user;
! $user_id = ($user_id === false) ? (int) $user->data['user_id'] : (int) $user_id;
if (empty($sql_sort))
{
***************
*** 1697,1710 ****
while ($row = $db->sql_fetchrow($result))
{
if ($row['topic_last_post_time'] <= $row['mark_time'])
{
// Check if there're read topics for the forums having unread ones
! $read_topics_list[$row['topic_id']] = (int) $row['mark_time'];
}
else
{
! $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
}
}
$db->sql_freeresult($result);
--- 1694,1709 ----
while ($row = $db->sql_fetchrow($result))
{
+ $topic_id = (int) $row['topic_id'];
+
if ($row['topic_last_post_time'] <= $row['mark_time'])
{
// Check if there're read topics for the forums having unread ones
! $read_topics_list[$topic_id] = (int) $row['mark_time'];
}
else
{
! $unread_topics_list[$topic_id] = (int) $row['mark_time'];
}
}
$db->sql_freeresult($result);
***************
*** 1729,1735 ****
while ($row = $db->sql_fetchrow($result))
{
! $unread_topics_list[$row['topic_id']] = (int) $row['mark_time'];
}
$db->sql_freeresult($result);
--- 1728,1734 ----
while ($row = $db->sql_fetchrow($result))
{
! $unread_topics_list[(int) $row['topic_id']] = (int) $row['mark_time'];
}
$db->sql_freeresult($result);
***************
*** 1765,1771 ****
while ($row = $db->sql_fetchrow($result))
{
! $unread_topics_list[$row['topic_id']] = (int) $user->data['user_lastmark'];
}
$db->sql_freeresult($result);
}
--- 1764,1770 ----
while ($row = $db->sql_fetchrow($result))
{
! $unread_topics_list[(int) $row['topic_id']] = (int) $user->data['user_lastmark'];
}
$db->sql_freeresult($result);
}
***************
*** 1775,1783 ****
{
global $tracking_topics;
! if (!isset($tracking_topics) || !sizeof($tracking_topics))
{
! $tracking_topics = (isset($_COOKIE[$config['cookie_name'] . '_track'])) ? ((STRIP) ? stripslashes($_COOKIE[$config['cookie_name'] . '_track']) : $_COOKIE[$config['cookie_name'] . '_track']) : '';
$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
}
--- 1774,1782 ----
{
global $tracking_topics;
! if (empty($tracking_topics))
{
! $tracking_topics = request_var($config['cookie_name'] . '_track', '', false, true);
$tracking_topics = ($tracking_topics) ? tracking_unserialize($tracking_topics) : array();
}
***************
*** 1787,1793 ****
}
else
{
! $user_lastmark = $user->data['user_lastmark'];
}
$sql = 'SELECT t.topic_id, t.forum_id, t.topic_last_post_time
--- 1786,1792 ----
}
else
{
! $user_lastmark = (int) $user->data['user_lastmark'];
}
$sql = 'SELECT t.topic_id, t.forum_id, t.topic_last_post_time
***************
*** 1795,1801 ****
WHERE t.topic_last_post_time > ' . $user_lastmark . "
$sql_extra
$sql_sort";
-
$result = $db->sql_query_limit($sql, $sql_limit);
while ($row = $db->sql_fetchrow($result))
--- 1794,1799 ----
***************
*** 1824,1830 ****
{
$unread_topics_list[$topic_id] = $user_lastmark;
}
-
}
$db->sql_freeresult($result);
}
--- 1822,1827 ----
|
|
From: Andreas F. <ba...@ph...> - 2009-09-07 00:39:32
|
Author: bantu
Date: Mon Sep 7 00:59:35 2009
New Revision: 10112
Log:
Some smaller changes to r10041.
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_admin.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_admin.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_admin.php Mon Sep 7 00:59:35 2009
***************
*** 2517,2531 ****
if ($topic_id)
{
! $sql_forum = 'AND l.topic_id = ' . intval($topic_id);
}
else if (is_array($forum_id))
{
$sql_forum = 'AND ' . $db->sql_in_set('l.forum_id', array_map('intval', $forum_id));
}
! else
{
! $sql_forum = ($forum_id) ? 'AND l.forum_id = ' . intval($forum_id) : '';
}
break;
--- 2517,2531 ----
if ($topic_id)
{
! $sql_forum = 'AND l.topic_id = ' . (int) $topic_id;
}
else if (is_array($forum_id))
{
$sql_forum = 'AND ' . $db->sql_in_set('l.forum_id', array_map('intval', $forum_id));
}
! else if ($forum_id)
{
! $sql_forum = 'AND l.forum_id = ' . (int) $forum_id;
}
break;
***************
*** 2560,2566 ****
}
$operations = array();
! foreach ($user->lang as $key=>$value)
{
if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
{
--- 2560,2566 ----
}
$operations = array();
! foreach ($user->lang as $key => $value)
{
if (substr($key, 0, 4) == 'LOG_' && preg_match($keywords_pattern, $value))
{
***************
*** 2571,2579 ****
$sql_keywords = 'AND (';
if (!empty($operations))
{
! $sql_keywords.= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
}
! $sql_keywords.= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
}
$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
--- 2571,2579 ----
$sql_keywords = 'AND (';
if (!empty($operations))
{
! $sql_keywords .= $db->sql_in_set('l.log_operation', $operations) . ' OR ';
}
! $sql_keywords .= 'LOWER(l.log_data) ' . implode(' OR LOWER(l.log_data) ', $keywords) . ')';
}
$sql = "SELECT l.*, u.username, u.username_clean, u.user_colour
|
|
From: Meik S. <acy...@ph...> - 2009-09-05 12:39:52
|
Author: acydburn
Date: Sat Sep 5 13:12:23 2009
New Revision: 10110
Log:
add inputbox class to input in prosilver - Bug #50795
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html Sat Sep 5 13:12:23 2009
***************
*** 9,15 ****
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
--- 9,15 ----
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" class="inputbox" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
***************
*** 74,80 ****
<fieldset class="display-actions">
<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
<input class="button1" type="submit" value="{L_DELETE_MARKED}" name="action[del_marked]" />
!
<div><a href="#" onclick="marklist('mcp', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div>
</fieldset>
<!-- ENDIF -->
--- 74,80 ----
<fieldset class="display-actions">
<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
<input class="button1" type="submit" value="{L_DELETE_MARKED}" name="action[del_marked]" />
!
<div><a href="#" onclick="marklist('mcp', 'mark', true); return false;">{L_MARK_ALL}</a> :: <a href="#" onclick="marklist('mcp', 'mark', false); return false;">{L_UNMARK_ALL}</a></div>
</fieldset>
<!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html Sat Sep 5 13:12:23 2009
***************
*** 52,58 ****
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
--- 52,58 ----
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" class="inputbox" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
|
|
From: Meik S. <acy...@ph...> - 2009-09-05 12:28:35
|
Author: acydburn
Date: Sat Sep 5 13:21:34 2009
New Revision: 10111
Log:
Adjust r10110 - Also add autowidth class to keywords input field - Bug #50795 related
Modified:
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_logs.html Sat Sep 5 13:21:34 2009
***************
*** 9,15 ****
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" class="inputbox" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
--- 9,15 ----
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL -->{TOTAL} <!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/mcp_notes_user.html Sat Sep 5 13:21:34 2009
***************
*** 52,58 ****
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" class="inputbox" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
--- 52,58 ----
<ul class="linklist">
<li class="leftside">
! {L_SEARCH_KEYWORDS}: <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" /> <input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
|
|
From: Meik S. <acy...@ph...> - 2009-09-05 12:06:28
|
Author: acydburn
Date: Sat Sep 5 13:06:12 2009
New Revision: 10109
Log:
Fix r10041 - Bug #50765
Modified:
branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
Modified: branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/mcp/mcp_logs.php Sat Sep 5 13:06:12 2009
***************
*** 175,181 ****
$template->assign_vars(array(
'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start),
'TOTAL' => ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$log_operation_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
'L_TITLE' => $user->lang['MCP_LOGS'],
--- 175,181 ----
$template->assign_vars(array(
'PAGE_NUMBER' => on_page($log_count, $config['topics_per_page'], $start),
'TOTAL' => ($log_count == 1) ? $user->lang['TOTAL_LOG'] : sprintf($user->lang['TOTAL_LOGS'], $log_count),
! 'PAGINATION' => generate_pagination($this->u_action . "&$u_sort_param$keywords_param", $log_count, $config['topics_per_page'], $start, true),
'L_TITLE' => $user->lang['MCP_LOGS'],
***************
*** 192,198 ****
foreach ($log_data as $row)
{
$data = array();
!
$checks = array('viewtopic', 'viewforum');
foreach ($checks as $check)
{
--- 192,198 ----
foreach ($log_data as $row)
{
$data = array();
!
$checks = array('viewtopic', 'viewforum');
foreach ($checks as $check)
{
|
Author: acydburn
Date: Sat Sep 5 13:03:52 2009
New Revision: 10108
Log:
Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Sep 5 13:03:52 2009
***************
*** 207,212 ****
--- 207,213 ----
<li>[Fix] Add header gradient back into subsilver2 but keep site logo easily replaceable with smaller and bigger ones. (Bug #11142 - Patch by dark/Rain and Raimon)</li>
<li>[Fix] Send activation email when activating user from user settings. (Bug #43145)</li>
<li>[Fix] Do not show resend activation email link when using admin activation. (Bug #44375 - Patch by bbrunnrman)</li>
+ <li>[Fix] Do not display links to user/post search if search is disabled. (Bug #50685 - Patch by HardStyle)</li>
<li>[Change] submit_post() now accepts force_approved_state key passed to $data to indicate new posts being approved (true) or unapproved (false).</li>
<li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li>
<li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/memberlist_view.html Sat Sep 5 13:03:52 2009
***************
*** 84,90 ****
<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>
<!-- ENDIF -->
<dt>{L_TOTAL_POSTS}:</dt>
! <dd>{POSTS} | <strong><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></strong>
<!-- IF POSTS_PCT --><br />({POSTS_PCT} / {POSTS_DAY})<!-- ENDIF -->
<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --><br />({L_POSTS_IN_QUEUE})<!-- ENDIF -->
</dd>
--- 84,90 ----
<dd><strong>{WARNINGS}</strong><!-- IF U_NOTES or U_WARN --> [ <!-- IF U_NOTES --><a href="{U_NOTES}">{L_VIEW_NOTES}</a><!-- ENDIF --> <!-- IF U_WARN --><!-- IF U_NOTES --> | <!-- ENDIF --><a href="{U_WARN}">{L_WARN_USER}</a><!-- ENDIF --> ]<!-- ENDIF --></dd>
<!-- ENDIF -->
<dt>{L_TOTAL_POSTS}:</dt>
! <dd>{POSTS} <!-- IF S_DISPLAY_SEARCH -->| <strong><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></strong><!-- ENDIF -->
<!-- IF POSTS_PCT --><br />({POSTS_PCT} / {POSTS_DAY})<!-- ENDIF -->
<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />(<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>)<!-- ELSEIF POSTS_IN_QUEUE --><br />({L_POSTS_IN_QUEUE})<!-- ENDIF -->
</dd>
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/overall_header.html Sat Sep 5 13:03:52 2009
***************
*** 148,155 ****
<ul class="linklist leftside">
<li class="icon-ucp">
<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
! <!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF --> •
<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
<!-- IF U_RESTORE_PERMISSIONS --> •
<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
<!-- ENDIF -->
--- 148,157 ----
<ul class="linklist leftside">
<li class="icon-ucp">
<a href="{U_PROFILE}" title="{L_PROFILE}" accesskey="e">{L_PROFILE}</a>
! <!-- IF S_DISPLAY_PM --> (<a href="{U_PRIVATEMSGS}">{PRIVATE_MESSAGE_INFO}</a>)<!-- ENDIF -->
! <!-- IF S_DISPLAY_SEARCH --> •
<a href="{U_SEARCH_SELF}">{L_SEARCH_SELF}</a>
+ <!-- ENDIF -->
<!-- IF U_RESTORE_PERMISSIONS --> •
<a href="{U_RESTORE_PERMISSIONS}">{L_RESTORE_PERMISSIONS}</a>
<!-- ENDIF -->
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/memberlist_view.html Sat Sep 5 13:03:52 2009
***************
*** 84,90 ****
<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td>
<td><b class="gen">{POSTS}</b><span class="genmed"><!-- IF POSTS_PCT --><br />[{POSTS_PCT} / {POSTS_DAY}]<!-- ENDIF -->
<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />[<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>]<!-- ELSEIF POSTS_IN_QUEUE --><br />[{L_POSTS_IN_QUEUE}]<!-- ENDIF -->
! <br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a></span></td>
</tr>
<!-- IF S_SHOW_ACTIVITY -->
<tr>
--- 84,90 ----
<td class="gen" align="{S_CONTENT_FLOW_END}" valign="top" nowrap="nowrap">{L_TOTAL_POSTS}: </td>
<td><b class="gen">{POSTS}</b><span class="genmed"><!-- IF POSTS_PCT --><br />[{POSTS_PCT} / {POSTS_DAY}]<!-- ENDIF -->
<!-- IF POSTS_IN_QUEUE and U_MCP_QUEUE --><br />[<a href="{U_MCP_QUEUE}">{L_POSTS_IN_QUEUE}</a>]<!-- ELSEIF POSTS_IN_QUEUE --><br />[{L_POSTS_IN_QUEUE}]<!-- ENDIF -->
! <!-- IF S_DISPLAY_SEARCH --><br /><a href="{U_SEARCH_USER}">{L_SEARCH_USER_POSTS}</a><!-- ENDIF --></span></td>
</tr>
<!-- IF S_SHOW_ACTIVITY -->
<tr>
|
|
From: Andreas F. <ba...@ph...> - 2009-09-04 17:27:41
|
Author: bantu
Date: Fri Sep 4 18:27:13 2009
New Revision: 10107
Log:
Revert r10106 - Index usage is very unlikely because of WHERE IN (). :-|
Modified:
branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
Modified: branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php Fri Sep 4 18:27:13 2009
***************
*** 1869,1875 ****
'PRIMARY_KEY' => 'user_id',
'KEYS' => array(
'user_birthday' => array('INDEX', 'user_birthday'),
- 'user_regdate' => array('INDEX', 'user_regdate'),
'user_email_hash' => array('INDEX', 'user_email_hash'),
'user_type' => array('INDEX', 'user_type'),
'username_clean' => array('UNIQUE', 'username_clean'),
--- 1869,1874 ----
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Sep 4 18:27:13 2009
***************
*** 241,247 ****
<li>[Change] Resize oversized Topic icons (Bug #44415)</li>
<li>[Change] Banned IPs are now sorted (Bug #43045 - Patch by DavidIQ)</li>
<li>[Change] phpBB updater now skips sole whitespace changes. This reduces the chance of conflicts tremendously.</li>
- <li>[Change] Add index on user_regdate to the users table.</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
--- 241,246 ----
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Fri Sep 4 18:27:13 2009
***************
*** 877,885 ****
POSTS_TABLE => array(
'post_username' => array('post_username'),
),
- USERS_TABLE => array(
- 'user_regdate' => array('user_regdate'),
- ),
),
),
);
--- 877,882 ----
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql Fri Sep 4 18:27:13 2009
***************
*** 1381,1387 ****
ALTER TABLE phpbb_users ADD PRIMARY KEY (user_id);;
CREATE INDEX phpbb_users_user_birthday ON phpbb_users(user_birthday);;
- CREATE INDEX phpbb_users_user_regdate ON phpbb_users(user_regdate);;
CREATE INDEX phpbb_users_user_email_hash ON phpbb_users(user_email_hash);;
CREATE INDEX phpbb_users_user_type ON phpbb_users(user_type);;
CREATE UNIQUE INDEX phpbb_users_username_clean ON phpbb_users(username_clean);;
--- 1381,1386 ----
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql Fri Sep 4 18:27:13 2009
***************
*** 1666,1674 ****
CREATE INDEX [user_birthday] ON [phpbb_users]([user_birthday]) ON [PRIMARY]
GO
- CREATE INDEX [user_regdate] ON [phpbb_users]([user_regdate]) ON [PRIMARY]
- GO
-
CREATE INDEX [user_email_hash] ON [phpbb_users]([user_email_hash]) ON [PRIMARY]
GO
--- 1666,1671 ----
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql Fri Sep 4 18:27:13 2009
***************
*** 978,984 ****
user_reminded_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
PRIMARY KEY (user_id),
KEY user_birthday (user_birthday),
- KEY user_regdate (user_regdate),
KEY user_email_hash (user_email_hash),
KEY user_type (user_type),
UNIQUE username_clean (username_clean(255))
--- 978,983 ----
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql Fri Sep 4 18:27:13 2009
***************
*** 978,984 ****
user_reminded_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
PRIMARY KEY (user_id),
KEY user_birthday (user_birthday),
- KEY user_regdate (user_regdate),
KEY user_email_hash (user_email_hash),
KEY user_type (user_type),
UNIQUE username_clean (username_clean)
--- 978,983 ----
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql Fri Sep 4 18:27:13 2009
***************
*** 1804,1811 ****
CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday)
/
- CREATE INDEX phpbb_users_user_regdate ON phpbb_users (user_regdate)
- /
CREATE INDEX phpbb_users_user_email_hash ON phpbb_users (user_email_hash)
/
CREATE INDEX phpbb_users_user_type ON phpbb_users (user_type)
--- 1804,1809 ----
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql Fri Sep 4 18:27:13 2009
***************
*** 1243,1249 ****
);
CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);
- CREATE INDEX phpbb_users_user_regdate ON phpbb_users (user_regdate);
CREATE INDEX phpbb_users_user_email_hash ON phpbb_users (user_email_hash);
CREATE INDEX phpbb_users_user_type ON phpbb_users (user_type);
CREATE UNIQUE INDEX phpbb_users_username_clean ON phpbb_users (username_clean);
--- 1243,1248 ----
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql Fri Sep 4 18:27:13 2009
***************
*** 949,955 ****
);
CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);
- CREATE INDEX phpbb_users_user_regdate ON phpbb_users (user_regdate);
CREATE INDEX phpbb_users_user_email_hash ON phpbb_users (user_email_hash);
CREATE INDEX phpbb_users_user_type ON phpbb_users (user_type);
CREATE UNIQUE INDEX phpbb_users_username_clean ON phpbb_users (username_clean);
--- 949,954 ----
|
|
From: Andreas F. <ba...@ph...> - 2009-09-04 15:44:25
|
Author: bantu
Date: Fri Sep 4 16:44:10 2009
New Revision: 10106
Log:
Add INDEX on user_regdate because this is the default ORDER BY in memberlist.php - thanks nickvergessen.
Modified:
branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
Modified: branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php (original)
--- branches/phpBB-3_0_0/phpBB/develop/create_schema_files.php Fri Sep 4 16:44:10 2009
***************
*** 1869,1874 ****
--- 1869,1875 ----
'PRIMARY_KEY' => 'user_id',
'KEYS' => array(
'user_birthday' => array('INDEX', 'user_birthday'),
+ 'user_regdate' => array('INDEX', 'user_regdate'),
'user_email_hash' => array('INDEX', 'user_email_hash'),
'user_type' => array('INDEX', 'user_type'),
'username_clean' => array('UNIQUE', 'username_clean'),
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Sep 4 16:44:10 2009
***************
*** 241,246 ****
--- 241,247 ----
<li>[Change] Resize oversized Topic icons (Bug #44415)</li>
<li>[Change] Banned IPs are now sorted (Bug #43045 - Patch by DavidIQ)</li>
<li>[Change] phpBB updater now skips sole whitespace changes. This reduces the chance of conflicts tremendously.</li>
+ <li>[Change] Add index on user_regdate to the users table.</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Fri Sep 4 16:44:10 2009
***************
*** 877,882 ****
--- 877,885 ----
POSTS_TABLE => array(
'post_username' => array('post_username'),
),
+ USERS_TABLE => array(
+ 'user_regdate' => array('user_regdate'),
+ ),
),
),
);
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/firebird_schema.sql Fri Sep 4 16:44:10 2009
***************
*** 1381,1386 ****
--- 1381,1387 ----
ALTER TABLE phpbb_users ADD PRIMARY KEY (user_id);;
CREATE INDEX phpbb_users_user_birthday ON phpbb_users(user_birthday);;
+ CREATE INDEX phpbb_users_user_regdate ON phpbb_users(user_regdate);;
CREATE INDEX phpbb_users_user_email_hash ON phpbb_users(user_email_hash);;
CREATE INDEX phpbb_users_user_type ON phpbb_users(user_type);;
CREATE UNIQUE INDEX phpbb_users_username_clean ON phpbb_users(username_clean);;
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mssql_schema.sql Fri Sep 4 16:44:10 2009
***************
*** 1666,1671 ****
--- 1666,1674 ----
CREATE INDEX [user_birthday] ON [phpbb_users]([user_birthday]) ON [PRIMARY]
GO
+ CREATE INDEX [user_regdate] ON [phpbb_users]([user_regdate]) ON [PRIMARY]
+ GO
+
CREATE INDEX [user_email_hash] ON [phpbb_users]([user_email_hash]) ON [PRIMARY]
GO
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_40_schema.sql Fri Sep 4 16:44:10 2009
***************
*** 978,983 ****
--- 978,984 ----
user_reminded_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
PRIMARY KEY (user_id),
KEY user_birthday (user_birthday),
+ KEY user_regdate (user_regdate),
KEY user_email_hash (user_email_hash),
KEY user_type (user_type),
UNIQUE username_clean (username_clean(255))
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/mysql_41_schema.sql Fri Sep 4 16:44:10 2009
***************
*** 978,983 ****
--- 978,984 ----
user_reminded_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
PRIMARY KEY (user_id),
KEY user_birthday (user_birthday),
+ KEY user_regdate (user_regdate),
KEY user_email_hash (user_email_hash),
KEY user_type (user_type),
UNIQUE username_clean (username_clean)
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/oracle_schema.sql Fri Sep 4 16:44:10 2009
***************
*** 1804,1809 ****
--- 1804,1811 ----
CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday)
/
+ CREATE INDEX phpbb_users_user_regdate ON phpbb_users (user_regdate)
+ /
CREATE INDEX phpbb_users_user_email_hash ON phpbb_users (user_email_hash)
/
CREATE INDEX phpbb_users_user_type ON phpbb_users (user_type)
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/postgres_schema.sql Fri Sep 4 16:44:10 2009
***************
*** 1243,1248 ****
--- 1243,1249 ----
);
CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);
+ CREATE INDEX phpbb_users_user_regdate ON phpbb_users (user_regdate);
CREATE INDEX phpbb_users_user_email_hash ON phpbb_users (user_email_hash);
CREATE INDEX phpbb_users_user_type ON phpbb_users (user_type);
CREATE UNIQUE INDEX phpbb_users_username_clean ON phpbb_users (username_clean);
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/sqlite_schema.sql Fri Sep 4 16:44:10 2009
***************
*** 949,954 ****
--- 949,955 ----
);
CREATE INDEX phpbb_users_user_birthday ON phpbb_users (user_birthday);
+ CREATE INDEX phpbb_users_user_regdate ON phpbb_users (user_regdate);
CREATE INDEX phpbb_users_user_email_hash ON phpbb_users (user_email_hash);
CREATE INDEX phpbb_users_user_type ON phpbb_users (user_type);
CREATE UNIQUE INDEX phpbb_users_username_clean ON phpbb_users (username_clean);
|
|
From: Meik S. <acy...@ph...> - 2009-09-04 15:20:18
|
Author: acydburn
Date: Fri Sep 4 16:19:26 2009
New Revision: 10105
Log:
Change version numbers to 3.0.6 and 3.0.6-RC1 for a final internal test run
Modified:
branches/phpBB-3_0_0/phpBB/docs/INSTALL.html
branches/phpBB-3_0_0/phpBB/includes/constants.php
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
branches/phpBB-3_0_0/phpBB/styles/prosilver/imageset/imageset.cfg
branches/phpBB-3_0_0/phpBB/styles/prosilver/style.cfg
branches/phpBB-3_0_0/phpBB/styles/prosilver/template/template.cfg
branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/theme.cfg
branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/imageset.cfg
branches/phpBB-3_0_0/phpBB/styles/subsilver2/style.cfg
branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/template.cfg
branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/theme.cfg
Modified: branches/phpBB-3_0_0/phpBB/docs/INSTALL.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/INSTALL.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/INSTALL.html Fri Sep 4 16:19:26 2009
***************
*** 273,279 ****
<p>This package is meant for those wanting to only replace changed files from a previous version to the latest version. This package normally contains the changed files from up to five previous versions.</p>
! <p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <samp>3.0.4</samp> you should select the phpBB-3.0.4_to_3.0.5.zip/tar.gz file.</p>
<p>The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any MODs these files will overwrite the originals possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.</p>
--- 273,279 ----
<p>This package is meant for those wanting to only replace changed files from a previous version to the latest version. This package normally contains the changed files from up to five previous versions.</p>
! <p>This package contains a number of archives, each contains the files changed from a given release to the latest version. You should select the appropriate archive for your current version, e.g. if you currently have <samp>3.0.5</samp> you should select the phpBB-3.0.5_to_3.0.6.zip/tar.gz file.</p>
<p>The directory structure has been preserved enabling you (if you wish) to simply upload the contents of the archive to the appropriate location on your server, i.e. simply overwrite the existing files with the new versions. Do not forget that if you have installed any MODs these files will overwrite the originals possibly destroying them in the process. You will need to re-add MODs to any affected file before uploading.</p>
***************
*** 285,291 ****
<p>The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p>
! <p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.4 you need the phpBB-3.0.4_to_3.0.5.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME]</strong> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
<p>If you do get failures you should look at using the <a href="#update_files">Changed files only</a> package to replace the files which failed to patch, please note that you will need to manually re-add any Modifications (MODs) to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.</p>
--- 285,291 ----
<p>The patch file is one solution for those with many Modifications (MODs) or other changes who do not want to re-add them back to all the changed files if they use the method explained above. To use this you will need command line access to a standard UNIX type <strong>patch</strong> application. If you do not have access to such an application but still want to use this update approach, we strongly recommend the <a href="#update_auto">Automatic update package</a> explained below. It is also the recommended update method.</p>
! <p>A number of patch files are provided to allow you to update from previous stable releases. Select the correct patch, e.g. if your current version is 3.0.5 you need the phpBB-3.0.5_to_3.0.6.patch file. Place the correct patch in the parent directory containing the phpBB3 core files (i.e. index.php, viewforum.php, etc.). With this done you should run the following command: <strong>patch -cl -d [PHPBB DIRECTORY] -p1 < [PATCH NAME]</strong> (where PHPBB DIRECTORY is the directory name your phpBB Installation resides in, for example phpBB3, and where PATCH NAME is the relevant filename of the selected patch file). This should complete quickly, hopefully without any HUNK FAILED comments.</p>
<p>If you do get failures you should look at using the <a href="#update_files">Changed files only</a> package to replace the files which failed to patch, please note that you will need to manually re-add any Modifications (MODs) to these particular files. Alternatively if you know how you can examine the .rej files to determine what failed where and make manual adjustments to the relevant source.</p>
Modified: branches/phpBB-3_0_0/phpBB/includes/constants.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/constants.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/constants.php Fri Sep 4 16:19:26 2009
***************
*** 25,31 ****
*/
// phpBB Version
! define('PHPBB_VERSION', '3.0.5');
// QA-related
// define('PHPBB_QA', 1);
--- 25,31 ----
*/
// phpBB Version
! define('PHPBB_VERSION', '3.0.6-RC1');
// QA-related
// define('PHPBB_QA', 1);
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Fri Sep 4 16:19:26 2009
***************
*** 8,14 ****
*
*/
! $updates_to_version = '3.0.6-alpha';
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = false;
--- 8,14 ----
*
*/
! $updates_to_version = '3.0.6-RC1';
// Enter any version to update from to test updates. The version within the db will not be updated.
$debug_from_version = false;
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql Fri Sep 4 16:19:26 2009
***************
*** 239,245 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6-alpha');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
--- 239,245 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6-RC1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/imageset/imageset.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/imageset/imageset.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/imageset/imageset.cfg Fri Sep 4 16:19:26 2009
***************
*** 19,25 ****
# General Information about this style
name = prosilver
copyright = © phpBB Group, 2007
! version = 3.0.5
# Images
img_site_logo = site_logo.gif*52*139
--- 19,25 ----
# General Information about this style
name = prosilver
copyright = © phpBB Group, 2007
! version = 3.0.6
# Images
img_site_logo = site_logo.gif*52*139
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/style.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/style.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/style.cfg Fri Sep 4 16:19:26 2009
***************
*** 19,22 ****
# General Information about this style
name = prosilver
copyright = © phpBB Group, 2007
! version = 3.0.5
\ No newline at end of file
--- 19,22 ----
# General Information about this style
name = prosilver
copyright = © phpBB Group, 2007
! version = 3.0.6
\ No newline at end of file
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/template/template.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/template/template.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/template/template.cfg Fri Sep 4 16:19:26 2009
***************
*** 19,25 ****
# General Information about this template
name = prosilver
copyright = © phpBB Group, 2007
! version = 3.0.5
# Defining a different template bitfield
template_bitfield = lNg=
--- 19,25 ----
# General Information about this template
name = prosilver
copyright = © phpBB Group, 2007
! version = 3.0.6
# Defining a different template bitfield
template_bitfield = lNg=
Modified: branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/theme.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/theme.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/prosilver/theme/theme.cfg Fri Sep 4 16:19:26 2009
***************
*** 21,27 ****
# General Information about this theme
name = prosilver
copyright = © phpBB Group, 2007
! version = 3.0.5
# Some configuration options
--- 21,27 ----
# General Information about this theme
name = prosilver
copyright = © phpBB Group, 2007
! version = 3.0.6
# Some configuration options
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/imageset.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/imageset.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/imageset/imageset.cfg Fri Sep 4 16:19:26 2009
***************
*** 19,25 ****
# General Information about this style
name = subsilver2
copyright = © phpBB Group, 2003
! version = 3.0.5
# Images
img_site_logo = site_logo.gif*94*170
--- 19,25 ----
# General Information about this style
name = subsilver2
copyright = © phpBB Group, 2003
! version = 3.0.6
# Images
img_site_logo = site_logo.gif*94*170
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/style.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/style.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/style.cfg Fri Sep 4 16:19:26 2009
***************
*** 19,22 ****
# General Information about this style
name = subsilver2
copyright = © 2005 phpBB Group
! version = 3.0.5
--- 19,22 ----
# General Information about this style
name = subsilver2
copyright = © 2005 phpBB Group
! version = 3.0.6
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/template.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/template.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/template/template.cfg Fri Sep 4 16:19:26 2009
***************
*** 19,23 ****
# General Information about this template
name = subsilver2
copyright = © phpBB Group, 2003
! version = 3.0.5
--- 19,23 ----
# General Information about this template
name = subsilver2
copyright = © phpBB Group, 2003
! version = 3.0.6
Modified: branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/theme.cfg
==============================================================================
*** branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/theme.cfg (original)
--- branches/phpBB-3_0_0/phpBB/styles/subsilver2/theme/theme.cfg Fri Sep 4 16:19:26 2009
***************
*** 21,27 ****
# General Information about this theme
name = subsilver2
copyright = © phpBB Group, 2003
! version = 3.0.5
# Some configuration options
--- 21,27 ----
# General Information about this theme
name = subsilver2
copyright = © phpBB Group, 2003
! version = 3.0.6
# Some configuration options
|
|
From: Meik S. <acy...@ph...> - 2009-09-04 14:59:29
|
Author: acydburn
Date: Fri Sep 4 15:58:44 2009
New Revision: 10104
Log:
Let the user notice that downloading the files is not the end of the update process.
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/install_update.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/install_update.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/install_update.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/install_update.html Fri Sep 4 15:58:44 2009
***************
*** 394,400 ****
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
! <input type="submit" class="button2" value="{L_CHECK_FILES_AGAIN}" name="check_again" /> <input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
</fieldset>
</form>
--- 394,400 ----
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
! <input type="submit" class="button2" value="{L_CONTINUE_UPDATE}" name="check_again" /> <input type="submit" class="button1" value="{L_DOWNLOAD}" name="download" />
</fieldset>
</form>
|
|
From: Jim W. <ter...@ph...> - 2009-09-04 14:54:19
|
Author: terrafrost
Date: Fri Sep 4 15:53:35 2009
New Revision: 10103
Log:
- fixed bug #44975
Modified:
branches/phpBB-3_0_0/phpBB/includes/session.php
Modified: branches/phpBB-3_0_0/phpBB/includes/session.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/session.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/session.php Fri Sep 4 15:53:35 2009
***************
*** 1361,1366 ****
--- 1361,1380 ----
WHERE user_id = ' . (int) $user_id;
$db->sql_query($sql);
+ // Update last visit info first before deleting sessions
+ $sql = 'SELECT session_time, session_page
+ FROM ' . SESSIONS_TABLE . '
+ WHERE session_user_id = ' . (int) $user_id . '
+ ORDER BY session_time DESC';
+ $result = $db->sql_query_limit($sql, 1);
+ $row = $db->sql_fetchrow($result);
+ $db->sql_freeresult($result);
+
+ $sql = 'UPDATE ' . USERS_TABLE . '
+ SET user_lastvisit = ' . (int) $row['session_time'] . ", user_lastpage = '" . $db->sql_escape($row['session_page']) . "'
+ WHERE user_id = " . (int) $user_id;
+ $db->sql_query($sql);
+
// Let's also clear any current sessions for the specified user_id
// If it's the current user then we'll leave this session intact
$sql_where = 'session_user_id = ' . (int) $user_id;
|
|
From: Meik S. <acy...@ph...> - 2009-09-04 14:50:53
|
Author: acydburn
Date: Fri Sep 4 15:50:05 2009
New Revision: 10102
Log:
phpBB updater now skips sole whitespace changes. This reduces the chance of conflicts tremendously.
Modified:
branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
branches/phpBB-3_0_0/phpBB/includes/diff/engine.php
Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Fri Sep 4 15:50:05 2009
***************
*** 240,245 ****
--- 240,246 ----
<li>[Change] Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615)</li>
<li>[Change] Resize oversized Topic icons (Bug #44415)</li>
<li>[Change] Banned IPs are now sorted (Bug #43045 - Patch by DavidIQ)</li>
+ <li>[Change] phpBB updater now skips sole whitespace changes. This reduces the chance of conflicts tremendously.</li>
<li>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
<li>[Feature] Backported 3.2 captcha plugins.
<ul>
Modified: branches/phpBB-3_0_0/phpBB/includes/diff/engine.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/diff/engine.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/diff/engine.php Fri Sep 4 15:50:05 2009
***************
*** 49,54 ****
--- 49,56 ----
*/
class diff_engine
{
+ var $skip_whitespace_changes = true;
+
function diff(&$from_lines, &$to_lines, $preserve_cr = true)
{
// Remove empty lines...
***************
*** 176,181 ****
--- 178,197 ----
$add[] = $to_lines[$yi++];
}
+ // Here we are a bit naughty. Naughty Boy... Naughty Boy...
+ // We check if delete and add is filled and only consist of one item
+ if ($this->skip_whitespace_changes && sizeof($delete) == 1 && sizeof($add) == 1)
+ {
+ // Now we simply trim the string and see if the lines are identical
+ // If they are identical we do not need to take them into account for the merge (less conflicts in phpBB)
+ if (trim($delete[0]) === trim($add[0]))
+ {
+ // This line ensures the line found here is correctly copied later (remember: we naughty boys like loops)
+ $xi--; $yi--; $this->xchanged[$xi] = $this->ychanged[$yi] = false;
+ $delete = $add = array();
+ }
+ }
+
if ($delete && $add)
{
$edits[] = new diff_op_change($delete, $add);
|
|
From: Meik S. <acy...@ph...> - 2009-09-04 14:49:54
|
Author: acydburn
Date: Fri Sep 4 15:49:41 2009
New Revision: 10101
Log:
spelling
Modified:
branches/phpBB-3_0_0/phpBB/language/en/install.php
Modified: branches/phpBB-3_0_0/phpBB/language/en/install.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/language/en/install.php (original)
--- branches/phpBB-3_0_0/phpBB/language/en/install.php Fri Sep 4 15:49:41 2009
***************
*** 470,476 ****
'NO_VISIBLE_CHANGES' => 'No visible changes',
'NOTICE' => 'Notice',
'NUM_CONFLICTS' => 'Number of conflicts',
! 'NUMBER_OF_FILES_COLLECTED' => 'Currently differences of %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
--- 470,476 ----
'NO_VISIBLE_CHANGES' => 'No visible changes',
'NOTICE' => 'Notice',
'NUM_CONFLICTS' => 'Number of conflicts',
! 'NUMBER_OF_FILES_COLLECTED' => 'Currently differences from %1$d of %2$d files have been checked.<br />Please wait until all files are checked.',
'OLD_UPDATE_FILES' => 'Update files are out of date. The update files found are for updating from phpBB %1$s to phpBB %2$s but the latest version of phpBB is %3$s.',
|
|
From: Meik S. <acy...@ph...> - 2009-09-04 14:48:51
|
Author: acydburn
Date: Fri Sep 4 15:48:35 2009
New Revision: 10100
Log:
Somehow i must've been blind while adding/changing the links. Consistency!
Modified:
branches/phpBB-3_0_0/phpBB/adm/style/install_update.html
Modified: branches/phpBB-3_0_0/phpBB/adm/style/install_update.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/adm/style/install_update.html (original)
--- branches/phpBB-3_0_0/phpBB/adm/style/install_update.html Fri Sep 4 15:48:35 2009
***************
*** 219,226 ****
<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
<dd style="margin-left: 60%;">
! <!-- IF not new.S_BINARY -->[ <a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>
! <!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
<!-- IF new.S_CUSTOM -->
<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
--- 219,225 ----
<!-- IF new.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
<dd style="margin-left: 60%;">
! <!-- IF not new.S_BINARY -->[<a href="{new.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
<!-- IF new.S_CUSTOM -->
<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
***************
*** 243,249 ****
<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
! <dd style="margin-left: 60%;"><!-- IF not not_modified.S_BINARY -->[ <a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
<!-- IF not_modified.S_CUSTOM -->
<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
<!-- ENDIF -->
--- 242,248 ----
<dt style="width: 60%;"><strong><!-- IF not_modified.DIR_PART -->{not_modified.DIR_PART}<br /><!-- ENDIF -->{not_modified.FILE_PART}</strong>
<!-- IF not_modified.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{not_modified.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
! <dd style="margin-left: 60%;"><!-- IF not not_modified.S_BINARY -->[<a href="{not_modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{not_modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
<!-- IF not_modified.S_CUSTOM -->
<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{not_modified.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
<!-- ENDIF -->
***************
*** 271,277 ****
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
! <dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[ <a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a> ]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
--- 270,276 ----
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="0" checked="checked" /> {L_MERGE_MODIFICATIONS_OPTION}</label></dt>
! <dd style="margin-left: 60%;"><!-- IF not modified.S_BINARY -->[<a href="{modified.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{modified.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF --></dd>
</dl>
<dl>
<dt style="width: 60%"><label><input type="radio" class="radio" name="modified[{modified.FILENAME}]" value="1" /> {L_MERGE_NO_MERGE_NEW_OPTION}</label></dt>
***************
*** 298,305 ****
<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
<dd style="margin-left: 60%;">
! <!-- IF not new_conflict.S_BINARY -->[ <a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>
! <!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
<!-- IF new_conflict.S_CUSTOM -->
<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
--- 297,303 ----
<!-- IF new_conflict.S_CUSTOM --><br /><span><em>{L_FILE_USED}: </em>{new_conflict.CUSTOM_ORIGINAL}</span><!-- ENDIF -->
</dt>
<dd style="margin-left: 60%;">
! <!-- IF not new_conflict.S_BINARY -->[<a href="{new_conflict.U_SHOW_DIFF}" onclick="diff_popup(this.href); return false;">{new_conflict.L_SHOW_DIFF}</a>]<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
<!-- IF new_conflict.S_CUSTOM -->
<dd style="margin-left: 60%;"><label><input type="checkbox" name="no_update[]" value="{new_conflict.FILENAME}" class="radio" /> {L_DO_NOT_UPDATE}</label></dd>
***************
*** 323,329 ****
<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
</dt>
<dd style="margin-left: 60%;">
! <!-- IF not conflict.S_BINARY -->[ <a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a> ]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
<!-- IF conflict.S_CUSTOM -->
--- 321,327 ----
<!-- IF conflict.NUM_CONFLICTS --><br /><span>{L_NUM_CONFLICTS}: {conflict.NUM_CONFLICTS}</span><!-- ENDIF -->
</dt>
<dd style="margin-left: 60%;">
! <!-- IF not conflict.S_BINARY -->[<a href="{conflict.U_SHOW_DIFF}">{L_DOWNLOAD_CONFLICTS}</a>]<br />{L_DOWNLOAD_CONFLICTS_EXPLAIN}
<!-- ELSE -->{L_BINARY_FILE}<!-- ENDIF -->
</dd>
<!-- IF conflict.S_CUSTOM -->
***************
*** 462,468 ****
</dl>
<!-- END data -->
</fieldset>
!
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
--- 460,466 ----
</dl>
<!-- END data -->
</fieldset>
!
<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}
<input class="button2" type="submit" name="check_again" value="{L_BACK}" />
|
|
From: Andreas F. <ba...@ph...> - 2009-09-04 12:04:45
|
Author: bantu
Date: Fri Sep 4 13:04:30 2009
New Revision: 10099
Log:
Also update newest user data if someone is creating a founder with user_add().
Modified:
branches/phpBB-3_0_0/phpBB/includes/functions_user.php
Modified: branches/phpBB-3_0_0/phpBB/includes/functions_user.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/functions_user.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/functions_user.php Fri Sep 4 13:04:30 2009
***************
*** 308,314 ****
}
// set the newest user and adjust the user count if the user is a normal user and no activation mail is sent
! if ($user_row['user_type'] == USER_NORMAL)
{
set_config('newest_user_id', $user_id, true);
set_config('newest_username', $user_row['username'], true);
--- 308,314 ----
}
// set the newest user and adjust the user count if the user is a normal user and no activation mail is sent
! if ($user_row['user_type'] == USER_NORMAL || $user_row['user_type'] == USER_FOUNDER)
{
set_config('newest_user_id', $user_id, true);
set_config('newest_username', $user_row['username'], true);
|
|
From: Meik S. <acy...@ph...> - 2009-09-04 10:25:44
|
Author: acydburn
Date: Fri Sep 4 11:25:31 2009
New Revision: 10098
Log:
changes for a little internal update test run
Modified:
branches/phpBB-3_0_0/phpBB/install/database_update.php
branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
Modified: branches/phpBB-3_0_0/phpBB/install/database_update.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/database_update.php (original)
--- branches/phpBB-3_0_0/phpBB/install/database_update.php Fri Sep 4 11:25:31 2009
***************
*** 8,17 ****
*
*/
! $updates_to_version = '3.0.6-dev';
// Enter any version to update from to test updates. The version within the db will not be updated.
! $debug_from_version = '3.0.5';
// Which oldest version does this updater support?
$oldest_from_version = '3.0.0';
--- 8,17 ----
*
*/
! $updates_to_version = '3.0.6-alpha';
// Enter any version to update from to test updates. The version within the db will not be updated.
! $debug_from_version = false;
// Which oldest version does this updater support?
$oldest_from_version = '3.0.0';
***************
*** 834,840 ****
// No changes from 3.0.5-RC1 to 3.0.5
'3.0.5-RC1' => array(),
! // Changes from 3.0.5
'3.0.5' => array(
'add_columns' => array(
CONFIRM_TABLE => array(
--- 834,840 ----
// No changes from 3.0.5-RC1 to 3.0.5
'3.0.5-RC1' => array(),
! // Changes from 3.0.5 to 3.0.6-RC1
'3.0.5' => array(
'add_columns' => array(
CONFIRM_TABLE => array(
Modified: branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql
==============================================================================
*** branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql (original)
--- branches/phpBB-3_0_0/phpBB/install/schemas/schema_data.sql Fri Sep 4 11:25:31 2009
***************
*** 239,245 ****
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.5');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
--- 239,245 ----
INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
! INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.6-alpha');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');
|
7 messages has been excluded from this view by a project administrator.
