Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the PHP5 strict standards notice for the TGM_Bulk_Installer_Skin #165

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 10 additions & 10 deletions tgm-plugin-activation/class-tgm-plugin-activation.php
Original file line number Diff line number Diff line change
Expand Up @@ -448,10 +448,10 @@ protected function do_plugin_install() {
/** Set plugin source to WordPress API link if available */
if ( isset( $plugin['source'] ) && 'repo' == $plugin['source'] ) {
$api = plugins_api( 'plugin_information', array( 'slug' => $plugin['slug'], 'fields' => array( 'sections' => false ) ) );

if ( is_wp_error( $api ) )
wp_die( $this->strings['oops'] . var_dump( $api ) );

if ( isset( $api->download_link ) )
$plugin['source'] = $api->download_link;
}
Expand Down Expand Up @@ -913,7 +913,7 @@ public function force_activation() {

/** Set file_path parameter for any installed plugins */
$this->populate_file_path();

$installed_plugins = get_plugins();

foreach ( $this->plugins as $plugin ) {
Expand Down Expand Up @@ -1115,24 +1115,24 @@ protected function _gather_plugin_data() {

$i++;
}

/** Sort plugins by Required/Recommended type and by alphabetical listing within each type */
$resort = array();
$req = array();
$rec = array();

/** Grab all the plugin types */
foreach ( $table_data as $plugin )
$resort[] = $plugin['type'];

/** Sort each plugin by type */
foreach ( $resort as $type )
if ( 'Required' == $type )
$req[] = $type;
else
$rec[] = $type;
/** Sort alphabetically each plugin type array, merge them and then sort in reverse (lists Required plugins first) */

/** Sort alphabetically each plugin type array, merge them and then sort in reverse (lists Required plugins first) */
sort( $req );
sort( $rec );
array_merge( $resort, $req, $rec );
Expand Down Expand Up @@ -1974,7 +1974,7 @@ public function add_strings() {
*
* @since 2.2.0
*/
public function before() {
public function before( $title = '' ) {

/** We are currently in the plugin installation loop, so set to true */
$this->in_loop = true;
Expand All @@ -1996,7 +1996,7 @@ public function before() {
*
* @since 2.2.0
*/
public function after() {
public function after( $title = '' ) {

/** Close install strings */
echo '</p></div>';
Expand Down