Merge pull request #332 from thomasgriffin/feature/fix-203-default-path

GaryJones · GaryJones · commit 6d8a1c3860ba · 2015-04-24T21:05:09.000+01:00
Fix Bulk install not honouring 'default_path'
diff --git a/class-tgm-plugin-activation.php b/class-tgm-plugin-activation.php
@@ -1528,7 +1528,7 @@ public function column_cb( $item ) {
 			}
 			elseif ( __( 'Pre-Packaged', 'tgmpa' ) === $item['source'] ) {
 				// Encode file path for use in attribute
-				$plugin_url = urlencode( $plugin_url );
+				$plugin_url = urlencode( $this->tgmpa->default_path . $plugin_url );
 			}
 
 			$value = $item['file_path'] . ',' . $plugin_url . ',' . $item['sanitized_plugin'];

Original file line number	Diff line number	Diff line change
`@@ -1528,7 +1528,7 @@ public function column_cb( $item ) {`
`1528`	`1528`	`}`
`1529`	`1529`	`elseif ( __( 'Pre-Packaged', 'tgmpa' ) === $item['source'] ) {`
`1530`	`1530`	`// Encode file path for use in attribute`
`1531`		`- $plugin_url = urlencode( $plugin_url );`
	`1531`	`+ $plugin_url = urlencode( $this->tgmpa->default_path . $plugin_url );`
`1532`	`1532`	`}`
`1533`	`1533`
`1534`	`1534`	`$value = $item['file_path'] . ',' . $plugin_url . ',' . $item['sanitized_plugin'];`