Merge pull request #34 from bytepixie/fix-non-object-on-expand-#33

Fix non object on expand

Author: ianmjones

.travis.yml

@@ -10,8 +10,11 @@ php:
 env:
   - WP_VERSION=3.9 WP_MULTISITE=0
   - WP_VERSION=3.9 WP_MULTISITE=1
-  - WP_VERSION=latest WP_MULTISITE=0
-  - WP_VERSION=latest WP_MULTISITE=1
+  - WP_VERSION=4.6 WP_MULTISITE=0
+  - WP_VERSION=4.6 WP_MULTISITE=1
+
+services:
+  - mysql
 
 script:
   #

src/admin/class-options-pixie-admin.php

@@ -530,13 +530,16 @@ public function ajax_toggle_truncate() {
 		$column    = sanitize_key( $_REQUEST['column'] );
 		$collapsed = sanitize_key( $_REQUEST['collapsed'] );
 
-		$item                 = apply_filters( 'options_pixie_get_item', null, array( 'blog_id' => $blog_id, 'option_id' => $option_id ) );
-		$options['column']    = $column;
-		$options['collapsed'] = ( 'true' === $collapsed ) ? false : true;
-		$value                = apply_filters( 'options_pixie_column_display', $item->{$column}, $item, $options );
-		$row_actions          = apply_filters( 'options_pixie_column_row_actions', $item->{$column}, $item, $options );
-		$row_actions          = apply_filters( 'options_pixie_format_row_actions', $row_actions );
-		echo $value . $row_actions;
+		$item = apply_filters( 'options_pixie_get_item', null, array( 'blog_id' => $blog_id, 'option_id' => $option_id ) );
+
+		if ( ! empty( $item ) ) {
+			$options['column']    = $column;
+			$options['collapsed'] = ( 'true' === $collapsed ) ? false : true;
+			$value                = apply_filters( 'options_pixie_column_display', $item->{$column}, $item, $options );
+			$row_actions          = apply_filters( 'options_pixie_column_row_actions', $item->{$column}, $item, $options );
+			$row_actions          = apply_filters( 'options_pixie_format_row_actions', $row_actions );
+			echo $value . $row_actions;
+		}
 		wp_die();
 	}
 

tests/bin/run-travis-unittests.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-RUN_CMD="tests/bin/run-unittests.sh -d wordpress_test -u travis -h 127.0.0.1"
+RUN_CMD="tests/bin/run-unittests.sh -d wordpress_test -u root"
 
 #
 # Only run coverage check for one build as it's quite slow.