mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Issue #2531 - Theme/Plugin upgrade modal.

Browse Source
This commit is contained in:
Cameron
2017-04-16 09:22:15 -07:00
parent 9e8800cead
commit 57e8b8f06b
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
e107_admin/plugin.php
View File

@@ -1095,7 +1095,16 @@ class plugin_online_ui extends e_admin_ui
$this -> pluginCheck(true); // rescan the plugin directory $this -> pluginCheck(true); // rescan the plugin directory
$text = e107::getPlugin()->install($pluginFolder); $text = e107::getPlugin()->install($pluginFolder);
$mes->addInfo($text); $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'); echo $mes->render('default', 'success');
} }
else else

2
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -1397,7 +1397,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
if(!empty($versions[$folder]['version']) && version_compare( $version, $versions[$folder]['version'], '<')) 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]; $ret[] = $versions[$folder];
e107::getMessage()->addDebug("Local version: ".$version." Remote version: ".$versions[$folder]['version']); e107::getMessage()->addDebug("Local version: ".$version." Remote version: ".$versions[$folder]['version']);
} }

2
e107_handlers/e_marketplace.php
View File

@@ -277,7 +277,7 @@ class e_marketplace
); );
$d = http_build_query($srcData,false,'&'); $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';
} }