Mass convert NULL -> null. Left strings and comments alone, obviously.

[lhc/web/wiklou.git] / includes / GlobalFunctions.php

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 57c33c4..4d1f1f5 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1277,7 +1277,7 @@ function wfSetBit( &$dest, $bit, $state = true ) {
  * "days=7&limit=100". Options in the first array override options in the second.
  * Options set to "" will not be output.
  */
-function wfArrayToCGI( $array1, $array2 = NULL )
+function wfArrayToCGI( $array1, $array2 = null )
 {
        if ( !is_null( $array2 ) ) {
                $array1 = $array1 + $array2;
@@ -1717,7 +1717,7 @@ function mimeTypeMatch( $type, $avail ) {
                } elseif( array_key_exists( '*/*', $avail ) ) {
                        return '*/*';
                } else {
-                       return NULL;
+                       return null;
                }
        }
 }
@@ -1759,7 +1759,7 @@ function wfNegotiateType( $cprefs, $sprefs ) {
        }
 
        $bestq = 0;
-       $besttype = NULL;
+       $besttype = null;
 
        foreach( array_keys( $combine ) as $type ) {
                if( $combine[$type] > $bestq ) {