Merge pull request #258 from WildcardSearch/maintenance

3.1.3 Release
WildcardSearch · Sep 12, 2017 · 3256f88 · 3256f88
2 parents 78a697c + 9715042
commit 3256f88
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-## Advanced-Sidebox 3.1.2
+## Advanced-Sidebox 3.1.3
 
 <p align="center">
   <img title="Advanced Sidebox Logo" alt="Advanced Sidebox Logo" src="http://i.imgur.com/4QWLq5V.png" />

diff --git a/Upload/inc/plugins/asb.php b/Upload/inc/plugins/asb.php
@@ -15,7 +15,7 @@
 // for modules
 define('IN_ASB', true);
 define('ASB_MODULES_DIR', MYBB_ROOT . 'inc/plugins/asb/modules');
-define('ASB_VERSION', '3.1.2');
+define('ASB_VERSION', '3.1.3');
 
 // some basic functions used everywhere
 require_once MYBB_ROOT . 'inc/plugins/asb/functions.php';

diff --git a/Upload/inc/plugins/asb/install.php b/Upload/inc/plugins/asb/install.php
@@ -20,7 +20,7 @@
  */
 function asb_info()
 {
-	global $mybb, $lang, $cp_style;
+	global $mybb, $lang, $cp_style, $cache;
 
 	if (!$lang->asb) {
 		$lang->load('asb');
@@ -39,18 +39,29 @@ function asb_info()
 EOF;
 		}
 
+		// only show Manage Sideboxes link if active
+		$plugin_list = $cache->read('plugins');
+		$manage_link = '';
+		if (!empty($plugin_list['active']) &&
+			is_array($plugin_list['active']) &&
+			in_array('asb', $plugin_list['active'])) {
+			$url = ASB_URL;
+			$manage_link = <<<EOF
+	<li style="list-style-image: url(styles/{$cp_style}/images/asb/manage.png)">
+		<a href="{$url}" title="{$lang->asb_manage_sideboxes}">{$lang->asb_manage_sideboxes}</a>
+	</li>
+EOF;
+		}
+
 		$settings_link = <<<EOF
 	<li style="list-style-image: url(styles/{$cp_style}/images/asb/settings.png)">
 		{$settings_link}
 	</li>
 EOF;
-		$url = ASB_URL;
 		$extra_links = <<<EOF
 <ul>
 	{$settings_link}
-	<li style="list-style-image: url(styles/{$cp_style}/images/asb/manage.png)">
-		<a href="{$url}" title="{$lang->asb_manage_sideboxes}">{$lang->asb_manage_sideboxes}</a>
-	</li>{$remove_link}
+	{$manage_link}{$remove_link}
 	<li style="list-style-image: url(styles/{$cp_style}/images/asb/help.png)">
 		<a href="https://github.com/WildcardSearch/Advanced-Sidebox/wiki/Help-Installation" title="{$lang->asb_help}">{$lang->asb_help}</a>
 	</li>

diff --git a/Upload/inc/plugins/asb/modules/recent_posts.php b/Upload/inc/plugins/asb/modules/recent_posts.php
@@ -286,7 +286,7 @@ function recent_posts_get_postlist($settings)
 		}
 
 		$post['subject'] = htmlspecialchars_uni($parser->parse_badwords($post['subject']));
-		$post['link'] = get_thread_link($post['tid']) . "&amp;pid={$post['pid']}#pid{$post['pid']}";
+		$post['link'] = get_post_link($post['pid'], $post['tid']) . "#pid{$post['pid']}";
 
 		// we just need the text and smilies (we'll parse them after we check length)
 		$pattern = "|[[\/\!]*?[^\[\]]*?]|si";