Version 4.6.0

applications/core/modules/front/system/pixabay.php

@@ -56,7 +56,8 @@ class _pixabay extends \IPS\Dispatcher\Controller
 				'key' => \IPS\Settings::i()->pixabay_apikey,
 				'image_type' => 'photo',
 				'per_page' => 20,
-				'page' => ( $offset ) ? ceil( $offset / 20 ) + 1 : 1
+				'page' => ( $offset ) ? ceil( $offset / 20 ) + 1 : 1,
+				'safesearch' => ( \IPS\Settings::i()->pixabay_safesearch ) ? 'true' : 'false',
 			);
 
 			$parameters['q'] = urlencode( $query );
@@ -79,6 +80,7 @@ class _pixabay extends \IPS\Dispatcher\Controller
 				\IPS\Output::i()->json( array('error' => $request['message'] ) );
 			}
 
+
 			$results = array( 'pagination' => array( 'total_count' => $request['total'] ) );
 			foreach ( $request['hits'] as $row )
 			{
@@ -89,6 +91,11 @@ class _pixabay extends \IPS\Dispatcher\Controller
 				);
 			}
 
+			if ( empty( $results['images'] ) )
+			{
+				\IPS\Output::i()->json( array( 'error' => \IPS\Theme::i()->getTemplate( 'system', 'core' )->noResults() ) );
+			}
+
 			\IPS\Output::i()->json( $results );
 		}
 	}