Version 4.7.13

system/Plugin/Hook.php

@@ -104,15 +104,17 @@ class _Hook extends \IPS\Patterns\ActiveRecord
 
 					/* Work out the contents */
 					$contents = str_replace(
-						array(
+					[
 							'{abstract}',
 							'{classname}',
-						),
-						array(
+							'{extended_class}',
+					],
+					[
 							$abstract,
 							$classname,
-						),
-						\file_get_contents( \IPS\ROOT_PATH . '/applications/core/data/defaults/Hook.txt' )
+							$hook->class
+					],
+					\file_get_contents( \IPS\ROOT_PATH . '/applications/core/data/defaults/Hook.txt' )
 					);
 
 					\file_put_contents( $hookDir . "/{$hook->filename}.php", $contents );

system/Plugin/Plugin.php

@@ -433,7 +433,7 @@ CODE;
 		}
 		
 		/* Upgrade */
-		if( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'applications', 'plugins_install' ) AND !$this->marketplace_id AND \IPS\IPS::canManageResources() AND \IPS\IPS::checkThirdParty() )
+		if( \IPS\Member::loggedIn()->hasAcpRestriction( 'core', 'applications', 'plugins_install' ) AND \IPS\IPS::canManageResources() )
 		{
 			$buttons['upgrade']	= array(
 				'icon'	=> 'upload',
@@ -481,14 +481,11 @@ CODE;
 				'link'	=> \IPS\Http\Url::internal( "app=core&module=applications&controller=plugins&do=developer&id={$this->_id}" ),
 			);
 
-            if( !$this->marketplace_id )
-            {
-                $buttons['download'] = array(
-                    'icon' => 'download',
-                    'title' => 'download',
-                    'link' => \IPS\Http\Url::internal("app=core&module=applications&controller=plugins&do=download&id={$this->_id}")->csrf(),
-                );
-            }
+            $buttons['download'] = array(
+                'icon' => 'download',
+                'title' => 'download',
+                'link' => \IPS\Http\Url::internal("app=core&module=applications&controller=plugins&do=download&id={$this->_id}")->csrf(),
+            );
 		}
 
 		if ( file_exists( \IPS\ROOT_PATH . "/plugins/{$this->location}/{$this->name}_{$this->version_human}.xml" ) AND !\IPS\IN_DEV )