NULL -> null

2 files changed, 39 insertions, 39 deletions

diff --git a/modules_v3/googlemap/module.php b/modules_v3/googlemap/module.php
index ac96a403f2..2c189bf34e 100644
--- a/modules_v3/googlemap/module.php
+++ b/modules_v3/googlemap/module.php
@@ -2765,7 +2765,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 	 * @param boolean  $lastlevel
 	 */
 	private function printGoogleMapMarkers($place2, $level, $parent, $levelm, $linklevels, $placelevels, $lastlevel = false) {
-		if (($place2['lati'] == NULL) || ($place2['long'] == NULL) || (($place2['lati'] == '0') && ($place2['long'] == '0'))) {
+		if (($place2['lati'] == null) || ($place2['long'] == null) || (($place2['lati'] == '0') && ($place2['long'] == '0'))) {
 			echo 'var icon_type = new google.maps.MarkerImage();';
 			echo 'icon_type.image = "', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/marker_yellow.png";';
 			echo 'icon_type.shadow = "', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/shadow50.png";';
@@ -2779,7 +2779,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 				if ($place2['place'] == "Unknown") echo "'><br>";
 				else echo addslashes($place2['place']), "'><br>";
 			}
-			if (($place2['icon'] != NULL) && ($place2['icon'] != '')) {
+			if (($place2['icon'] != null) && ($place2['icon'] != '')) {
 				echo '<img src=\"', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2['icon'], '\">&nbsp;&nbsp;';
 			}
 			if ($lastlevel) {
@@ -2838,7 +2838,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 			}
 
 			// flags by kiwi3685 ---
-			if (($place2['icon'] == NULL) || ($place2['icon'] == '') || ($this->getSetting('GM_PH_MARKER') != 'G_FLAG')) {
+			if (($place2['icon'] == null) || ($place2['icon'] == '') || ($this->getSetting('GM_PH_MARKER') != 'G_FLAG')) {
 				echo 'var icon_type = new google.maps.MarkerImage();';
 			} else {
 				echo 'var icon_type = new google.maps.MarkerImage();';
@@ -2858,7 +2858,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 					echo addslashes($place2['place']), "'><br>";
 				}
 			}
-			if (($place2['icon'] != NULL) && ($place2['icon'] != "")) {
+			if (($place2['icon'] != null) && ($place2['icon'] != "")) {
 				echo '<img src=\"', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place2['icon'], '\">&nbsp;&nbsp;';
 			}
 			if ($lastlevel) {
@@ -4038,7 +4038,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 				<td class="optionbox" colspan="2">
 					<div id="flagsDiv">
 		<?php
-				if (($place_icon == NULL) || ($place_icon == "")) { ?>
+				if (($place_icon == null) || ($place_icon == "")) { ?>
 						<a href="#" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a>
 		<?php   }
 				else { ?>
@@ -4149,7 +4149,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 								}
 							}
 						}
-						else $placelist[$j]['lati'] = NULL;
+						else $placelist[$j]['lati'] = null;
 						if (preg_match("/4 LONG (.*)/", $placerec, $match)) {
 							$placelist[$j]['long'] = trim($match[1]);
 							if (($placelist[$j]['long'][0] != 'E') && ($placelist[$j]['long'][0] != 'W')) {
@@ -4160,7 +4160,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 								}
 							}
 						}
-						else $placelist[$j]['long'] = NULL;
+						else $placelist[$j]['long'] = null;
 						$j = $j + 1;
 					}
 					$i = $i + 1;
@@ -4534,8 +4534,8 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu
 			echo '<td>', $place['long'], '</td>';
 			echo '<td>', $place['zoom'], '</td>';
 			echo '<td>';
-			if (($place['icon'] == NULL) || ($place['icon'] == '')) {
-				if (($place['lati'] == NULL) || ($place['long'] == NULL) || (($place['lati'] == '0') && ($place['long'] == '0'))) {
+			if (($place['icon'] == null) || ($place['icon'] == '')) {
+				if (($place['lati'] == null) || ($place['long'] == null) || (($place['lati'] == '0') && ($place['long'] == '0'))) {
 					echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/images/mm_20_yellow.png">';
 				}
 				else {
diff --git a/modules_v3/random_media/module.php b/modules_v3/random_media/module.php
index d3612086d9..079a983a6f 100644
--- a/modules_v3/random_media/module.php
+++ b/modules_v3/random_media/module.php
@@ -54,36 +54,36 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block {
 			" AND m_type IN (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '')"
 		)->execute(array(
 			WT_GED_ID,
-			get_block_setting($block_id, 'filter_avi', false) ? 'avi' : NULL,
-			get_block_setting($block_id, 'filter_bmp', true) ? 'bmp' : NULL,
-			get_block_setting($block_id, 'filter_gif', true) ? 'gif' : NULL,
-			get_block_setting($block_id, 'filter_jpeg', true) ? 'jpg' : NULL,
-			get_block_setting($block_id, 'filter_jpeg', true) ? 'jpeg' : NULL,
-			get_block_setting($block_id, 'filter_mp3', false) ? 'mp3' : NULL,
-			get_block_setting($block_id, 'filter_ole', true) ? 'ole' : NULL,
-			get_block_setting($block_id, 'filter_pcx', true) ? 'pcx' : NULL,
-			get_block_setting($block_id, 'filter_pdf', false) ? 'pdf' : NULL,
-			get_block_setting($block_id, 'filter_png', true) ? 'png' : NULL,
-			get_block_setting($block_id, 'filter_tiff', true) ? 'tiff' : NULL,
-			get_block_setting($block_id, 'filter_wav', false) ? 'wav' : NULL,
-			get_block_setting($block_id, 'filter_audio', false) ? 'audio' : NULL,
-			get_block_setting($block_id, 'filter_book', true) ? 'book' : NULL,
-			get_block_setting($block_id, 'filter_card', true) ? 'card' : NULL,
-			get_block_setting($block_id, 'filter_certificate', true) ? 'certificate' : NULL,
-			get_block_setting($block_id, 'filter_coat', true) ? 'coat' : NULL,
-			get_block_setting($block_id, 'filter_document', true) ? 'document' : NULL,
-			get_block_setting($block_id, 'filter_electronic', true) ? 'electronic' : NULL,
-			get_block_setting($block_id, 'filter_fiche', true) ? 'fiche' : NULL,
-			get_block_setting($block_id, 'filter_film', true) ? 'film' : NULL,
-			get_block_setting($block_id, 'filter_magazine', true) ? 'magazine' : NULL,
-			get_block_setting($block_id, 'filter_manuscript', true) ? 'manuscript' : NULL,
-			get_block_setting($block_id, 'filter_map', true) ? 'map' : NULL,
-			get_block_setting($block_id, 'filter_newspaper', true) ? 'newspaper' : NULL,
-			get_block_setting($block_id, 'filter_other', true) ? 'other' : NULL,
-			get_block_setting($block_id, 'filter_painting', true) ? 'painting' : NULL,
-			get_block_setting($block_id, 'filter_photo', true) ? 'photo' : NULL,
-			get_block_setting($block_id, 'filter_tombstone', true) ? 'tombstone' : NULL,
-			get_block_setting($block_id, 'filter_video', false) ? 'video' : NULL,
+			get_block_setting($block_id, 'filter_avi', false) ? 'avi' : null,
+			get_block_setting($block_id, 'filter_bmp', true) ? 'bmp' : null,
+			get_block_setting($block_id, 'filter_gif', true) ? 'gif' : null,
+			get_block_setting($block_id, 'filter_jpeg', true) ? 'jpg' : null,
+			get_block_setting($block_id, 'filter_jpeg', true) ? 'jpeg' : null,
+			get_block_setting($block_id, 'filter_mp3', false) ? 'mp3' : null,
+			get_block_setting($block_id, 'filter_ole', true) ? 'ole' : null,
+			get_block_setting($block_id, 'filter_pcx', true) ? 'pcx' : null,
+			get_block_setting($block_id, 'filter_pdf', false) ? 'pdf' : null,
+			get_block_setting($block_id, 'filter_png', true) ? 'png' : null,
+			get_block_setting($block_id, 'filter_tiff', true) ? 'tiff' : null,
+			get_block_setting($block_id, 'filter_wav', false) ? 'wav' : null,
+			get_block_setting($block_id, 'filter_audio', false) ? 'audio' : null,
+			get_block_setting($block_id, 'filter_book', true) ? 'book' : null,
+			get_block_setting($block_id, 'filter_card', true) ? 'card' : null,
+			get_block_setting($block_id, 'filter_certificate', true) ? 'certificate' : null,
+			get_block_setting($block_id, 'filter_coat', true) ? 'coat' : null,
+			get_block_setting($block_id, 'filter_document', true) ? 'document' : null,
+			get_block_setting($block_id, 'filter_electronic', true) ? 'electronic' : null,
+			get_block_setting($block_id, 'filter_fiche', true) ? 'fiche' : null,
+			get_block_setting($block_id, 'filter_film', true) ? 'film' : null,
+			get_block_setting($block_id, 'filter_magazine', true) ? 'magazine' : null,
+			get_block_setting($block_id, 'filter_manuscript', true) ? 'manuscript' : null,
+			get_block_setting($block_id, 'filter_map', true) ? 'map' : null,
+			get_block_setting($block_id, 'filter_newspaper', true) ? 'newspaper' : null,
+			get_block_setting($block_id, 'filter_other', true) ? 'other' : null,
+			get_block_setting($block_id, 'filter_painting', true) ? 'painting' : null,
+			get_block_setting($block_id, 'filter_photo', true) ? 'photo' : null,
+			get_block_setting($block_id, 'filter_tombstone', true) ? 'tombstone' : null,
+			get_block_setting($block_id, 'filter_video', false) ? 'video' : null,
 		))->fetchOneColumn();
 
 		// Keep looking through the media until a suitable one is found.