Skip to content

Commit bdc215c

Browse files
author
Mark Vincent
authored
Merge pull request #261 from WildcardSearch/maintenance
3.1.4 Release
2 parents 3256f88 + 7929efb commit bdc215c

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
## Advanced-Sidebox 3.1.3
1+
## Advanced-Sidebox 3.1.4
22

33
<p align="center">
44
<img title="Advanced Sidebox Logo" alt="Advanced Sidebox Logo" src="http://i.imgur.com/4QWLq5V.png" />

‎Upload/inc/plugins/asb.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// for modules
1616
define('IN_ASB', true);
1717
define('ASB_MODULES_DIR', MYBB_ROOT . 'inc/plugins/asb/modules');
18-
define('ASB_VERSION', '3.1.3');
18+
define('ASB_VERSION', '3.1.4');
1919

2020
// some basic functions used everywhere
2121
require_once MYBB_ROOT . 'inc/plugins/asb/functions.php';

‎Upload/inc/plugins/asb/acp.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1167,17 +1167,17 @@ function asb_admin_manage_scripts()
11671167
$form_container->output_row($lang->asb_width_left, $lang->asb_width_left_desc, $form->generate_text_box('width_left', $data['width_left']));
11681168
$form_container->output_row($lang->asb_width_right, $lang->asb_width_right_desc, $form->generate_text_box('width_right', $data['width_right']));
11691169

1170-
$form_container->output_row("{$lang->asb_output_to_vars}?", $lang->sprintf($lang->asb_output_to_vars_desc, '<span style="font-family: courier; font-weight: bold; font-size: 1.2em;">$asb_left</span> and <span style="font-family: courier; font-weight: bold; font-size: 1.2em;";>$asb_right</span>'), $form->generate_yes_no_radio('eval', $data['eval'], true, array("id" => 'eval_yes', "class" => 'eval'), array("id" => 'eval_no', "class" => 'eval')), '', '', array("id" => 'var_output'));
1170+
$form_container->output_row("{$lang->asb_output_to_vars}?", $lang->sprintf($lang->asb_output_to_vars_desc, '<span style="font-family: courier; font-weight: bold; font-size: 1.2em;">$asb_left</span> and <span style="font-family: courier; font-weight: bold; font-size: 1.2em;";>$asb_right</span>'), $form->generate_yes_no_radio('eval', $data['eval'], true, array("id" => 'eval_yes', "class" => 'eval'), array("id" => 'eval_no', "class" => 'eval')), '', array(), array("id" => 'var_output'));
11711171

1172-
$form_container->output_row("{$lang->asb_template}:", $lang->asb_template_desc, "{$spinner}<div id=\"template_list\"{$detected_show}>{$detected_info['templates']}</div>" . $form->generate_text_box('template_name', $data['template_name'], array("id" => 'template_name')), '', '', array("id" => 'template_row'));
1173-
$form_container->output_row("{$lang->asb_hook}:", $lang->asb_hook_desc, "{$spinner}<div id=\"hook_list\"{$detected_show}>{$detected_info['hooks']}</div>" . $form->generate_text_box('hook', $data['hook'], array("id" => 'hook')), '', '', array("id" => 'hook_row'));
1172+
$form_container->output_row("{$lang->asb_template}:", $lang->asb_template_desc, "{$spinner}<div id=\"template_list\"{$detected_show}>{$detected_info['templates']}</div>" . $form->generate_text_box('template_name', $data['template_name'], array("id" => 'template_name')), '', array(), array("id" => 'template_row'));
1173+
$form_container->output_row("{$lang->asb_hook}:", $lang->asb_hook_desc, "{$spinner}<div id=\"hook_list\"{$detected_show}>{$detected_info['hooks']}</div>" . $form->generate_text_box('hook', $data['hook'], array("id" => 'hook')), '', array(), array("id" => 'hook_row'));
11741174

1175-
$form_container->output_row($lang->asb_header_search_text, $lang->asb_header_search_text_desc, $form->generate_text_area('find_top', $data['find_top'], array("id" => 'find_top', 'class' => '', 'style' => 'width: 100%;', "rows" => '3')), '', '', array("id" => 'header_search'));
1176-
$form_container->output_row($lang->asb_footer_search_text, $lang->asb_footer_search_text_desc, $form->generate_text_area('find_bottom', $data['find_bottom'], array("id" => 'find_bottom', 'class' => '', 'style' => 'width: 100%; height: 100px;')) . $form->generate_hidden_field('id', $data['id']) . $form->generate_hidden_field('active', $data['active']) . $form->generate_hidden_field('action', 'manage_scripts') . $form->generate_hidden_field('mode', 'edit'), '', '', array("id" => 'footer_search'));
1175+
$form_container->output_row($lang->asb_header_search_text, $lang->asb_header_search_text_desc, $form->generate_text_area('find_top', $data['find_top'], array("id" => 'find_top', 'class' => '', 'style' => 'width: 100%;', "rows" => '3')), '', array(), array("id" => 'header_search'));
1176+
$form_container->output_row($lang->asb_footer_search_text, $lang->asb_footer_search_text_desc, $form->generate_text_area('find_bottom', $data['find_bottom'], array("id" => 'find_bottom', 'class' => '', 'style' => 'width: 100%; height: 100px;')) . $form->generate_hidden_field('id', $data['id']) . $form->generate_hidden_field('active', $data['active']) . $form->generate_hidden_field('action', 'manage_scripts') . $form->generate_hidden_field('mode', 'edit'), '', array(), array("id" => 'footer_search'));
11771177

1178-
$form_container->output_row($lang->asb_replace_template, $lang->asb_replace_template_desc, $form->generate_yes_no_radio('replace_all', $data['replace_all'], true, array("id" => 'replace_all_yes', "class" => 'replace_all'), array("id" => 'replace_all_no', "class" => 'replace_all')), '', '', array("id" => 'replace_all'));
1178+
$form_container->output_row($lang->asb_replace_template, $lang->asb_replace_template_desc, $form->generate_yes_no_radio('replace_all', $data['replace_all'], true, array("id" => 'replace_all_yes', "class" => 'replace_all'), array("id" => 'replace_all_no', "class" => 'replace_all')), '', array(), array("id" => 'replace_all'));
11791179

1180-
$form_container->output_row($lang->asb_replacement_content, $lang->asb_replacement_content_desc, $form->generate_text_area('replacement', $data['replacement'], array("id" => 'replacement', 'class' => '', 'style' => 'width: 100%; height: 240px;')), '', '', array("id" => 'replace_content'));
1180+
$form_container->output_row($lang->asb_replacement_content, $lang->asb_replacement_content_desc, $form->generate_text_area('replacement', $data['replacement'], array("id" => 'replacement', 'class' => '', 'style' => 'width: 100%; height: 240px;')), '', array(), array("id" => 'replace_content'));
11811181

11821182
$form_container->end();
11831183

‎Upload/inc/plugins/asb/install_data.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"id" => 'INT(10) NOT NULL AUTO_INCREMENT PRIMARY KEY',
1313
"display_order" => 'INT(10) NOT NULL',
1414
"box_type" => 'VARCHAR(25) NOT NULL',
15-
"title" => 'VARCHAR(32) NOT NULL',
15+
"title" => 'TEXT',
1616
"title_link" => 'VARCHAR(128) NOT NULL',
1717
"position" => 'INT(2)',
1818
"scripts" => 'TEXT',

‎Upload/inc/plugins/asb/modules/private_messages.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ function asb_private_messages_build_template($args)
8484
$pm_message = $lang->sprintf($lang->asb_pms_user_disabled_pms, "<a href=\"{$mybb->settings['bburl']}/usercp.php?action=options\">{$lang->welcome_usercp}</a>");
8585
$$template_var = <<<EOF
8686
<tr>
87-
<td class='trow1'>{$pm_message}>/td>
87+
<td class='trow1'>{$pm_message}</td>
8888
</tr>
8989
EOF;
9090
return false;

‎Upload/inc/plugins/asb/upgrade.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
* this file contains upgrade functionality
88
*/
99

10-
global $lang, $asbOldVersion;
10+
global $lang, $asbOldVersion, $db;
1111
if (!$lang->asb) {
1212
$lang->load('asb');
1313
}
@@ -91,6 +91,11 @@
9191
));
9292
}
9393

94+
/* < 3.1.4 */
95+
if (version_compare($asbOldVersion, '3.1.4', '<')) {
96+
$db->modify_column('asb_sideboxes', 'title', 'TEXT');
97+
}
98+
9499
if (!empty($removedForumFiles)) {
95100
foreach ($removedForumFiles as $file) {
96101
@unlink(MYBB_ROOT . $file);

0 commit comments

Comments
 (0)