Skip to content

Commit 4b5fab3

Browse files
acydburnacydburn
committed
merge with revision #r8350
git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
1 parent 1407460 commit 4b5fab3

42 files changed

Lines changed: 199 additions & 188 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎phpBB/adm/style/acp_language.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,11 @@ <h1>{L_LANGUAGE_ENTRIES}</h1>
121121

122122
<!--[if lt IE 8]>
123123
<style type="text/css">
124+
/* <![CDATA[ */
124125
input.langvalue, textarea.langvalue {
125126
width: 450px;
126127
}
128+
/* ]]> */
127129
</style>
128130
<![endif]-->
129131

‎phpBB/adm/style/colour_swatch.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<title>{L_COLOUR_SWATCH}</title>
99

1010
<style type="text/css">
11-
<!--
11+
/* <![CDATA[ */
1212
body {
1313
background-color: #404040;
1414
color: #fff;
@@ -29,7 +29,7 @@
2929
img {
3030
border: 0;
3131
}
32-
//-->
32+
/* ]]> */
3333
</style>
3434
</head>
3535

‎phpBB/adm/style/install_update_diff.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
</script>
3333

3434
<style type="text/css">
35-
<!--
35+
/* <![CDATA[ */
3636

3737
#main {
3838
font-size: 1em;
@@ -198,7 +198,7 @@
198198

199199
<!-- ENDIF -->
200200

201-
//-->
201+
/* ]]> */
202202
</style>
203203

204204
</head>

‎phpBB/docs/CHANGELOG.html‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ <h1>Changelog</h1>
108108
<li>[Fix] Fix possible database transaction errors if code returns on error and rollback happened (Bug #17025)</li>
109109
<li>[Change] Allow numbers in permission names for modifications, as well as uppercase letters for the request_ part (Bug #20125)</li>
110110
<li>[Fix] Use HTTP_HOST in favor of SERVER_NAME for determining server url for redirection and installation (Bug #19955)</li>
111+
<li>Removing s_watching_img from watch_topic_forum() function (Bug #20445)</li>
112+
<li>Changing order for post review if more than one post affected (Bug #15249)</li>
113+
<li>Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479)</li>
114+
<li>Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738)</li>
115+
<li>Tiny code fixes (Bug #20165, #20025, #19795, #14804)</li>
111116
</ul>
112117

113118
<a name="v30rc8"></a><h3>1.i. Changes since 3.0.RC8</h3>

‎phpBB/docs/hook_system.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<title>phpBB3 &bull; Hook System</title>
1515

1616
<style type="text/css">
17-
<!--
17+
/* <![CDATA[ */
1818

1919
/*
2020
The original "prosilver" theme for phpBB3
@@ -309,7 +309,7 @@
309309
margin-left: 25px;
310310
}
311311

312-
//-->
312+
/* ]]> */
313313
</style>
314314

315315
</head>

‎phpBB/includes/acp/acp_attachments.php‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class acp_attachments
2323
{
2424
var $u_action;
2525
var $new_config;
26-
26+
2727
function main($id, $mode)
2828
{
2929
global $db, $user, $auth, $template, $cache;
@@ -56,7 +56,7 @@ function main($id, $mode)
5656
case 'ext_groups':
5757
$l_title = 'ACP_EXTENSION_GROUPS';
5858
break;
59-
59+
6060
case 'orphan':
6161
$l_title = 'ACP_ORPHAN_ATTACHMENTS';
6262
break;
@@ -212,7 +212,7 @@ function main($id, $mode)
212212

213213
// Secure Download Options - Same procedure as with banning
214214
$allow_deny = ($this->new_config['secure_allow_deny']) ? 'ALLOWED' : 'DISALLOWED';
215-
215+
216216
$sql = 'SELECT *
217217
FROM ' . SITELIST_TABLE;
218218
$result = $db->sql_query($sql);
@@ -282,7 +282,7 @@ function main($id, $mode)
282282
'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars),
283283
)
284284
);
285-
285+
286286
unset($display_vars['vars'][$config_key]);
287287
}
288288

@@ -334,7 +334,7 @@ function main($id, $mode)
334334
FROM ' . EXTENSIONS_TABLE . '
335335
WHERE ' . $db->sql_in_set('extension_id', $extension_id_list);
336336
$result = $db->sql_query($sql);
337-
337+
338338
$extension_list = '';
339339
while ($row = $db->sql_fetchrow($result))
340340
{
@@ -364,7 +364,7 @@ function main($id, $mode)
364364
FROM ' . EXTENSIONS_TABLE . "
365365
WHERE extension = '" . $db->sql_escape($add_extension) . "'";
366366
$result = $db->sql_query($sql);
367-
367+
368368
if ($row = $db->sql_fetchrow($result))
369369
{
370370
$error[] = sprintf($user->lang['EXTENSION_EXIST'], $add_extension);
@@ -610,7 +610,7 @@ function main($id, $mode)
610610
SET group_id = 0
611611
WHERE group_id = $group_id";
612612
$db->sql_query($sql);
613-
613+
614614
add_log('admin', 'LOG_ATTACH_EXTGROUP_DEL', $group_name);
615615

616616
$cache->destroy('_extensions');
@@ -907,7 +907,7 @@ function main($id, $mode)
907907
$upload_list = array();
908908
foreach ($add_files as $attach_id)
909909
{
910-
if (!in_array($attach_id, array_keys($delete_files)) && !empty($post_ids[$attach_id]))
910+
if (!isset($delete_files[$attach_id]) && !empty($post_ids[$attach_id]))
911911
{
912912
$upload_list[$attach_id] = $post_ids[$attach_id];
913913
}
@@ -1057,7 +1057,7 @@ function category_select($select_name, $group_id = false, $key = '')
10571057
ATTACHMENT_CATEGORY_FLASH => $user->lang['CAT_FLASH_FILES'],
10581058
ATTACHMENT_CATEGORY_QUICKTIME => $user->lang['CAT_QUICKTIME_FILES'],
10591059
);
1060-
1060+
10611061
if ($group_id)
10621062
{
10631063
$sql = 'SELECT cat_id
@@ -1073,7 +1073,7 @@ function category_select($select_name, $group_id = false, $key = '')
10731073
{
10741074
$cat_type = ATTACHMENT_CATEGORY_NONE;
10751075
}
1076-
1076+
10771077
$group_select = '<select name="' . $select_name . '"' . (($key) ? ' id="' . $key . '"' : '') . '>';
10781078

10791079
foreach ($types as $type => $mode)
@@ -1093,7 +1093,7 @@ function category_select($select_name, $group_id = false, $key = '')
10931093
function group_select($select_name, $default_group = false, $key = '')
10941094
{
10951095
global $db, $user;
1096-
1096+
10971097
$group_select = '<select name="' . $select_name . '"' . (($key) ? ' id="' . $key . '"' : '') . '>';
10981098

10991099
$sql = 'SELECT group_id, group_name
@@ -1111,7 +1111,7 @@ function group_select($select_name, $default_group = false, $key = '')
11111111
$row['group_id'] = 0;
11121112
$row['group_name'] = $user->lang['NOT_ASSIGNED'];
11131113
$group_name[] = $row;
1114-
1114+
11151115
for ($i = 0; $i < sizeof($group_name); $i++)
11161116
{
11171117
if ($default_group === false)
@@ -1145,7 +1145,7 @@ function search_imagemagick()
11451145
if (empty($magic_home))
11461146
{
11471147
$locations = array('C:/WINDOWS/', 'C:/WINNT/', 'C:/WINDOWS/SYSTEM/', 'C:/WINNT/SYSTEM/', 'C:/WINDOWS/SYSTEM32/', 'C:/WINNT/SYSTEM32/', '/usr/bin/', '/usr/sbin/', '/usr/local/bin/', '/usr/local/sbin/', '/opt/', '/usr/imagemagick/', '/usr/bin/imagemagick/');
1148-
$path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH'))));
1148+
$path_locations = str_replace('\\', '/', (explode(($exe) ? ';' : ':', getenv('PATH'))));
11491149

11501150
$locations = array_merge($path_locations, $locations);
11511151

@@ -1359,7 +1359,7 @@ function perform_site_list()
13591359
$db->sql_query($sql);
13601360
}
13611361
}
1362-
1362+
13631363
if (!empty($ip_list_log))
13641364
{
13651365
// Update log

‎phpBB/includes/acp/acp_board.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ function main($id, $mode)
127127
'pm_max_msgs' => array('lang' => 'BOXES_LIMIT', 'validate' => 'int', 'type' => 'text:4:4', 'explain' => true),
128128
'full_folder_action' => array('lang' => 'FULL_FOLDER_ACTION', 'validate' => 'int', 'type' => 'select', 'method' => 'full_folder_select', 'explain' => true),
129129
'pm_edit_time' => array('lang' => 'PM_EDIT_TIME', 'validate' => 'int', 'type' => 'text:5:5', 'explain' => true, 'append' => ' ' . $user->lang['MINUTES']),
130-
130+
131131
'legend2' => 'GENERAL_OPTIONS',
132132
'allow_mass_pm' => array('lang' => 'ALLOW_MASS_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
133133
'auth_bbcode_pm' => array('lang' => 'ALLOW_BBCODE_PM', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
@@ -269,7 +269,7 @@ function main($id, $mode)
269269
'load_jumpbox' => array('lang' => 'YES_JUMPBOX', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
270270
'load_user_activity' => array('lang' => 'LOAD_USER_ACTIVITY', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
271271
'load_tplcompile' => array('lang' => 'RECOMPILE_STYLES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true),
272-
272+
273273
'legend3' => 'CUSTOM_PROFILE_FIELDS',
274274
'load_cpf_memberlist' => array('lang' => 'LOAD_CPF_MEMBERLIST', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
275275
'load_cpf_viewprofile' => array('lang' => 'LOAD_CPF_VIEWPROFILE', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false),
@@ -564,7 +564,7 @@ function main($id, $mode)
564564
'CONTENT' => build_cfg_template($type, $config_key, $this->new_config, $config_key, $vars),
565565
)
566566
);
567-
567+
568568
unset($display_vars['vars'][$config_key]);
569569
}
570570

@@ -795,7 +795,7 @@ function dateformat_select($value, $key)
795795
}
796796

797797
$dateformat_options .= '<option value="custom"';
798-
if (!in_array($value, array_keys($user->lang['dateformats'])))
798+
if (!isset($user->lang['dateformats'][$value]))
799799
{
800800
$dateformat_options .= ' selected="selected"';
801801
}

‎phpBB/includes/acp/acp_search.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -518,9 +518,9 @@ function display_progress_bar($type)
518518
function close_popup_js()
519519
{
520520
return "<script type=\"text/javascript\">\n" .
521-
"<!--\n" .
521+
"// <![CDATA[\n" .
522522
" close_waitscreen = 1;\n" .
523-
"//-->\n" .
523+
"// ]]>\n" .
524524
"</script>\n";
525525
}
526526

0 commit comments

Comments
 (0)