From 57e8b8f06b3dd11ce1bfaac915ddea35d7b8f971 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sun, 16 Apr 2017 09:22:15 -0700
Subject: [PATCH] Issue #2531 - Theme/Plugin upgrade modal.

---
 e107_admin/plugin.php                           | 9 +++++++++
 e107_core/shortcodes/batch/admin_shortcodes.php | 2 +-
 e107_handlers/e_marketplace.php                 | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 0ccf83330..fac5e7186 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -1095,7 +1095,16 @@ class plugin_online_ui extends e_admin_ui
 				$this -> pluginCheck(true); // rescan the plugin directory
 				$text = e107::getPlugin()->install($pluginFolder);
 
+
+
 				$mes->addInfo($text);
+
+				$upgradable =  e107::getPlug()->getUpgradableList();
+				if(!empty($upgradable[$pluginFolder]))
+				{
+					$mes->addSuccess("<a target='_top' href='".e_ADMIN."plugin.php?mode=installed&action=upgrade&id=".$pluginFolder."' class='btn btn-primary'>".LAN_UPDATE."</a>");
+				}
+
 				echo $mes->render('default', 'success');
 			}
 			else
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index 0448a8d43..9e58120d0 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -1397,7 +1397,7 @@ Inverse 	10 	<span class="badge badge-inverse">10</span>
 
 			if(!empty($versions[$folder]['version']) && version_compare( $version, $versions[$folder]['version'], '<'))
 			{
-				$versions[$folder]['modalDownload'] = $mp->getDownloadModal('theme', $versions[$folder]);
+				$versions[$folder]['modalDownload'] = $mp->getDownloadModal($type, $versions[$folder]);
 				$ret[] = $versions[$folder];
 				e107::getMessage()->addDebug("Local version: ".$version." Remote version: ".$versions[$folder]['version']);
 			}
diff --git a/e107_handlers/e_marketplace.php b/e107_handlers/e_marketplace.php
index daf9ec0fd..b577150c5 100644
--- a/e107_handlers/e_marketplace.php
+++ b/e107_handlers/e_marketplace.php
@@ -277,7 +277,7 @@ class e_marketplace
 			);
 
 			$d = http_build_query($srcData,false,'&');
-			$url = e_ADMIN.'theme.php?mode=download&src='.base64_encode($d);//$url.'&amp;action=download';
+			$url = e_ADMIN.'theme.php?mode=main&action=download&src='.base64_encode($d);//$url.'&amp;action=download';
 
 		}