_darcs/tentative_pristine

   1 hunk ./actions/allrss.php 28
   2 -    var $user = NULL;
   3 +    var $user = null;
   4 hunk ./actions/allrss.php 72
   5 -            return NULL;
   6 +            return null;
   7 hunk ./actions/allrss.php 75
   8 -        return ($avatar) ? $avatar->url : NULL;
   9 +        return ($avatar) ? $avatar->url : null;
  10 hunk ./actions/api.php 155
  11 -            common_element('error', NULL, $msg);
  12 -            common_element('request', NULL, $_SERVER['REQUEST_URI']);
  13 +            common_element('error', null, $msg);
  14 +            common_element('request', null, $_SERVER['REQUEST_URI']);
  15 hunk ./actions/block.php 24
  16 -    var $profile = NULL;
  17 +    var $profile = null;
  18 hunk ./actions/block.php 80
  19 -        common_element('p', NULL,
  20 +        common_element('p', null,
  21 hunk ./actions/confirmaddress.php 91
  22 -        common_element('p', NULL,
  23 +        common_element('p', null,
  24 hunk ./actions/deletenotice.php 44
  25 -    function show_form($error=NULL) {
  26 +    function show_form($error=null) {
  27 hunk ./actions/deletenotice.php 94
  28 -                common_set_returnto(NULL);
  29 +                common_set_returnto(null);
  30 hunk ./actions/deleteprofile.php 39
  31 -    function form_header($title, $msg=NULL, $success=false) {
  32 +    function form_header($title, $msg=null, $success=false) {
  33 hunk ./actions/deleteprofile.php 41
  34 -                           NULL,
  35 +                           null,
  36 hunk ./actions/deleteprofile.php 87
  37 -    function show_form($msg=NULL, $success=false) {
  38 +    function show_form($msg=null, $success=false) {
  39 hunk ./actions/deleteprofile.php 89
  40 -        common_element('h2', NULL, _('Delete my account confirmation'));
  41 +        common_element('h2', null, _('Delete my account confirmation'));
  42 hunk ./actions/deleteprofile.php 216
  43 -        common_set_user(NULL);
  44 +        common_set_user(null);
  45 hunk ./actions/emailsettings.php 30
  46 -    function show_form($msg=NULL, $success=false) {
  47 +    function show_form($msg=null, $success=false) {
  48 hunk ./actions/emailsettings.php 39
  49 -        common_element('h2', NULL, _('Address'));
  50 +        common_element('h2', null, _('Address'));
  51 hunk ./actions/emailsettings.php 61
  52 -                             ($this->arg('email')) ? $this->arg('email') : NULL,
  53 +                             ($this->arg('email')) ? $this->arg('email') : null,
  54 hunk ./actions/emailsettings.php 68
  55 -            common_element('h2', NULL, _('Incoming email'));
  56 +            common_element('h2', null, _('Incoming email'));
  57 hunk ./actions/emailsettings.php 86
  58 -        common_element('h2', NULL, _('Preferences'));
  59 +        common_element('h2', null, _('Preferences'));
  60 hunk ./actions/emailsettings.php 121
  61 -            return NULL;
  62 +            return null;
  63 hunk ./actions/emailsettings.php 276
  64 -        $user->email = NULL;
  65 +        $user->email = null;
  66 hunk ./actions/emailsettings.php 297
  67 -        $user->incomingemail = NULL;
  68 +        $user->incomingemail = null;
  69 hunk ./actions/favorited.php 32
  70 -                           array($this, 'show_header'), NULL,
  71 +                           array($this, 'show_header'), null,
  72 hunk ./actions/favoritesrss.php 28
  73 -    var $user = NULL;
  74 +    var $user = null;
  75 hunk ./actions/favoritesrss.php 71
  76 -        return NULL;
  77 +        return null;
  78 hunk ./actions/featured.php 33
  79 -                           array($this, 'show_header'), NULL,
  80 +                           array($this, 'show_header'), null,
  81 hunk ./actions/finishaddopenid.php 100
  82 -        common_element('p', NULL, $msg);
  83 +        common_element('p', null, $msg);
  84 hunk ./actions/finishopenidlogin.php 55
  85 -    function show_top($error=NULL) {
  86 +    function show_top($error=null) {
  87 hunk ./actions/finishopenidlogin.php 65
  88 -    function show_form($error=NULL, $username=NULL) {
  89 -        common_show_header(_('OpenID Account Setup'), NULL, $error,
  90 +    function show_form($error=null, $username=null) {
  91 +        common_show_header(_('OpenID Account Setup'), null, $error,
  92 hunk ./actions/finishopenidlogin.php 73
  93 -        common_element('h2', NULL,
  94 +        common_element('h2', null,
  95 hunk ./actions/finishopenidlogin.php 75
  96 -        common_element('p', NULL,
  97 +        common_element('p', null,
  98 hunk ./actions/finishopenidlogin.php 91
  99 -        common_element('h2', NULL,
 100 +        common_element('h2', null,
 101 hunk ./actions/finishopenidlogin.php 93
 102 -        common_element('p', NULL,
 103 +        common_element('p', null,
 104 hunk ./actions/finishopenidlogin.php 144
 105 -                $this->show_form(NULL, $this->best_new_nickname($display, $sreg));
 106 +                $this->show_form(null, $this->best_new_nickname($display, $sreg));
 107 hunk ./actions/finishopenidlogin.php 151
 108 -        common_element('p', NULL, $msg);
 109 +        common_element('p', null, $msg);
 110 hunk ./actions/finishopenidlogin.php 293
 111 -            common_set_returnto(NULL);
 112 +            common_set_returnto(null);
 113 hunk ./actions/finishopenidlogin.php 332
 114 -        return NULL;
 115 +        return null;
 116 hunk ./actions/finishopenidlogin.php 372
 117 -                return NULL;
 118 +                return null;
 119 hunk ./actions/finishopenidlogin.php 406
 120 -        return NULL;
 121 +        return null;
 122 hunk ./actions/finishopenidlogin.php 413
 123 -            return NULL;
 124 +            return null;
 125 hunk ./actions/finishremotesubscribe.php 281
 126 -            return NULL;
 127 +            return null;
 128 hunk ./actions/foaf.php 69
 129 -        common_element('mbox_sha1sum', NULL, sha1('mailto:' . $user->email));
 130 +        common_element('mbox_sha1sum', null, sha1('mailto:' . $user->email));
 131 hunk ./actions/foaf.php 71
 132 -            common_element('name', NULL, $profile->fullname);
 133 +            common_element('name', null, $profile->fullname);
 134 hunk ./actions/foaf.php 77
 135 -            common_element('rdfs:comment', NULL, $profile->bio);
 136 +            common_element('rdfs:comment', null, $profile->bio);
 137 hunk ./actions/foaf.php 83
 138 -            common_element('name', NULL, $profile->location);
 139 +            common_element('name', null, $profile->location);
 140 hunk ./actions/foaf.php 159
 141 -            $foaf_url = NULL;
 142 +            $foaf_url = null;
 143 hunk ./actions/foaf.php 169
 144 -                                              common_root_url() : NULL);
 145 +                                              common_root_url() : null);
 146 hunk ./actions/foaf.php 189
 147 -    function show_microblogging_account($profile, $service=NULL) {
 148 +    function show_microblogging_account($profile, $service=null) {
 149 hunk ./actions/foaf.php 197
 150 -        common_element('accountName', NULL, $profile->nickname);
 151 +        common_element('accountName', null, $profile->nickname);
 152 hunk ./actions/imsettings.php 31
 153 -    function show_form($msg=NULL, $success=false) {
 154 +    function show_form($msg=null, $success=false) {
 155 hunk ./actions/imsettings.php 40
 156 -        common_element('h2', NULL, _('Address'));
 157 +        common_element('h2', null, _('Address'));
 158 hunk ./actions/imsettings.php 62
 159 -                             ($this->arg('jabber')) ? $this->arg('jabber') : NULL,
 160 +                             ($this->arg('jabber')) ? $this->arg('jabber') : null,
 161 hunk ./actions/imsettings.php 68
 162 -        common_element('h2', NULL, _('Preferences'));
 163 +        common_element('h2', null, _('Preferences'));
 164 hunk ./actions/imsettings.php 96
 165 -            return NULL;
 166 +            return null;
 167 hunk ./actions/imsettings.php 247
 168 -        $user->jabber = NULL;
 169 +        $user->jabber = null;
 170 hunk ./actions/invite.php 88
 171 -            common_element('p', NULL, _('You are already subscribed to these users:'));
 172 +            common_element('p', null, _('You are already subscribed to these users:'));
 173 hunk ./actions/invite.php 91
 174 -                common_element('li', NULL, sprintf(_('%s (%s)'), $other->nickname, $other->email));
 175 +                common_element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
 176 hunk ./actions/invite.php 96
 177 -            common_element('p', NULL, _('These people are already users and you were automatically subscribed to them:'));
 178 +            common_element('p', null, _('These people are already users and you were automatically subscribed to them:'));
 179 hunk ./actions/invite.php 99
 180 -                common_element('li', NULL, sprintf(_('%s (%s)'), $other->nickname, $other->email));
 181 +                common_element('li', null, sprintf(_('%s (%s)'), $other->nickname, $other->email));
 182 hunk ./actions/invite.php 104
 183 -            common_element('p', NULL, _('Invitation(s) sent to the following people:'));
 184 +            common_element('p', null, _('Invitation(s) sent to the following people:'));
 185 hunk ./actions/invite.php 107
 186 -                common_element('li', NULL, $other);
 187 +                common_element('li', null, $other);
 188 hunk ./actions/invite.php 110
 189 -            common_element('p', NULL, _('You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!'));
 190 +            common_element('p', null, _('You will be notified when your invitees accept the invitation and register on the site. Thanks for growing the community!'));
 191 hunk ./actions/invite.php 115
 192 -    function show_top($error=NULL) {
 193 +    function show_top($error=null) {
 194 hunk ./actions/invite.php 120
 195 -            common_element('p', NULL,
 196 +            common_element('p', null,
 197 hunk ./actions/invite.php 126
 198 -    function show_form($error=NULL) {
 199 +    function show_form($error=null) {
 200 hunk ./actions/invite.php 130
 201 -        common_show_header(_('Invite new users'), NULL, $error, array($this, 'show_top'));
 202 +        common_show_header(_('Invite new users'), null, $error, array($this, 'show_top'));
 203 hunk ./actions/login.php 66
 204 -                common_set_returnto(NULL);
 205 +                common_set_returnto(null);
 206 hunk ./actions/login.php 94
 207 -            common_set_returnto(NULL);
 208 +            common_set_returnto(null);
 209 hunk ./actions/login.php 103
 210 -    function show_form($error=NULL) {
 211 -        common_show_header(_('Login'), NULL, $error, array($this, 'show_top'));
 212 +    function show_form($error=null) {
 213 +        common_show_header(_('Login'), null, $error, array($this, 'show_top'));
 214 hunk ./actions/login.php 141
 215 -    function show_top($error=NULL) {
 216 +    function show_top($error=null) {
 217 hunk ./actions/logout.php 35
 218 -            common_set_user(NULL);
 219 +            common_set_user(null);
 220 hunk ./actions/newmessage.php 101
 221 -    function show_form($msg=NULL) {
 222 +    function show_form($msg=null) {
 223 hunk ./actions/newmessage.php 120
 224 -        common_show_header(_('New message'), NULL,
 225 +        common_show_header(_('New message'), null,
 226 hunk ./actions/newnotice.php 81
 227 -        $notice = Notice::saveNew($user->id, $content, 'web', 1, ($replyto == 'false') ? NULL : $replyto);
 228 +        $notice = Notice::saveNew($user->id, $content, 'web', 1, ($replyto == 'false') ? null : $replyto);
 229 hunk ./actions/newnotice.php 124
 230 -    function show_top($content=NULL) {
 231 -        common_notice_form(NULL, $content);
 232 +    function show_top($content=null) {
 233 +        common_notice_form(null, $content);
 234 hunk ./actions/newnotice.php 128
 235 -    function show_form($msg=NULL) {
 236 +    function show_form($msg=null) {
 237 hunk ./actions/newnotice.php 141
 238 -        common_show_header(_('New notice'), NULL, $content,
 239 +        common_show_header(_('New notice'), null, $content,
 240 hunk ./actions/noticesearchrss.php 68
 241 -        return NULL;
 242 +        return null;
 243 hunk ./actions/openidlogin.php 55
 244 -            $this->show_form(NULL, $openid_url);
 245 +            $this->show_form(null, $openid_url);
 246 hunk ./actions/openidlogin.php 63
 247 -    function show_top($error=NULL) {
 248 +    function show_top($error=null) {
 249 hunk ./actions/openidlogin.php 75
 250 -    function show_form($error=NULL, $openid_url) {
 251 -        common_show_header(_('OpenID Login'), NULL, $error, array($this, 'show_top'));
 252 +    function show_form($error=null, $openid_url) {
 253 +        common_show_header(_('OpenID Login'), null, $error, array($this, 'show_top'));
 254 hunk ./actions/openidsettings.php 33
 255 -    function show_form($msg=NULL, $success=false) {
 256 +    function show_form($msg=null, $success=false) {
 257 hunk ./actions/openidsettings.php 44
 258 -        common_element('h2', NULL, _('Add OpenID'));
 259 -        common_element('p', NULL,
 260 +        common_element('h2', null, _('Add OpenID'));
 261 +        common_element('p', null,
 262 hunk ./actions/openidsettings.php 69
 263 -            common_element('h2', NULL, _('Remove OpenID'));
 264 +            common_element('h2', null, _('Remove OpenID'));
 265 hunk ./actions/openidsettings.php 73
 266 -                common_element('p', NULL,
 267 +                common_element('p', null,
 268 hunk ./actions/openidsettings.php 86
 269 -                common_element('p', NULL,
 270 +                common_element('p', null,
 271 hunk ./actions/opensearch.php 45
 272 -        common_element('ShortName', NULL, $short_name);
 273 -        common_element('Contact', NULL, common_config('site', 'email'));
 274 +        common_element('ShortName', null, $short_name);
 275 +        common_element('Contact', null, common_config('site', 'email'));
 276 hunk ./actions/opensearch.php 51
 277 -        common_element('AdultContent', NULL, 'false');
 278 -        common_element('Language', NULL, common_language());
 279 -        common_element('OutputEncoding', NULL, 'UTF-8');
 280 -        common_element('InputEncoding', NULL, 'UTF-8');
 281 +        common_element('AdultContent', null, 'false');
 282 +        common_element('Language', null, common_language());
 283 +        common_element('OutputEncoding', null, 'UTF-8');
 284 +        common_element('InputEncoding', null, 'UTF-8');
 285 hunk ./actions/othersettings.php 30
 286 -    function show_form($msg=NULL, $success=false) {
 287 +    function show_form($msg=null, $success=false) {
 288 hunk ./actions/othersettings.php 35
 289 -        common_element('h2', NULL, _('URL Auto-shortening'));
 290 +        common_element('h2', null, _('URL Auto-shortening'));
 291 hunk ./actions/othersettings.php 60
 292 -//        common_element('h2', NULL, _('Delete my account'));
 293 +//        common_element('h2', null, _('Delete my account'));
 294 hunk ./actions/peoplesearch.php 71
 295 -    var $terms = NULL;
 296 -    var $pattern = NULL;
 297 +    var $terms = null;
 298 +    var $pattern = null;
 299 hunk ./actions/peopletag.php 46
 300 -                           NULL, $tag, array($this, 'show_top'));
 301 +                           null, $tag, array($this, 'show_top'));
 302 hunk ./actions/peopletag.php 97
 303 -        return NULL;
 304 +        return null;
 305 hunk ./actions/profilesettings.php 31
 306 -    function show_form($msg=NULL, $success=false) {
 307 +    function show_form($msg=null, $success=false) {
 308 hunk ./actions/profilesettings.php 34
 309 -        common_element('h2', NULL, _('Avatar'));
 310 +        common_element('h2', null, _('Avatar'));
 311 hunk ./actions/profilesettings.php 36
 312 -        common_element('h2', NULL, _('Change password'));
 313 +        common_element('h2', null, _('Change password'));
 314 hunk ./actions/profilesettings.php 38
 315 -//        common_element('h2', NULL, _('Delete my account'));
 316 +//        common_element('h2', null, _('Delete my account'));
 317 hunk ./actions/public.php 34
 318 -                           array($this, 'show_header'), NULL,
 319 +                           array($this, 'show_header'), null,
 320 hunk ./actions/publicrss.php 55
 321 -        return NULL;
 322 +        return null;
 323 hunk ./actions/publicxrds.php 45
 324 -        common_element('Type', NULL, 'xri://$xrds*simple');
 325 +        common_element('Type', null, 'xri://$xrds*simple');
 326 hunk ./actions/publicxrds.php 58
 327 -    function show_service($type, $uri, $params=NULL, $sigs=NULL, $localId=NULL) {
 328 +    function show_service($type, $uri, $params=null, $sigs=null, $localId=null) {
 329 hunk ./actions/publicxrds.php 61
 330 -            common_element('URI', NULL, $uri);
 331 +            common_element('URI', null, $uri);
 332 hunk ./actions/publicxrds.php 63
 333 -        common_element('Type', NULL, $type);
 334 +        common_element('Type', null, $type);
 335 hunk ./actions/publicxrds.php 66
 336 -                common_element('Type', NULL, $param);
 337 +                common_element('Type', null, $param);
 338 hunk ./actions/publicxrds.php 71
 339 -                common_element('Type', NULL, $sig);
 340 +                common_element('Type', null, $sig);
 341 hunk ./actions/publicxrds.php 75
 342 -            common_element('LocalID', NULL, $localId);
 343 +            common_element('LocalID', null, $localId);
 344 hunk ./actions/recoverpassword.php 135
 345 -    function show_top($msg=NULL) {
 346 +    function show_top($msg=null) {
 347 hunk ./actions/recoverpassword.php 140
 348 -            common_element('p', NULL,
 349 +            common_element('p', null,
 350 hunk ./actions/recoverpassword.php 149
 351 -    function show_password_top($msg=NULL) {
 352 +    function show_password_top($msg=null) {
 353 hunk ./actions/recoverpassword.php 159
 354 -    function show_form($msg=NULL) {
 355 +    function show_form($msg=null) {
 356 hunk ./actions/recoverpassword.php 161
 357 -        common_show_header(_('Recover password'), NULL,
 358 +        common_show_header(_('Recover password'), null,
 359 hunk ./actions/recoverpassword.php 176
 360 -    function show_password_form($msg=NULL) {
 361 +    function show_password_form($msg=null) {
 362 hunk ./actions/recoverpassword.php 178
 363 -        common_show_header(_('Reset password'), NULL,
 364 +        common_show_header(_('Reset password'), null,
 365 hunk ./actions/recoverpassword.php 227
 366 -                $confirm_email = NULL;
 367 +                $confirm_email = null;
 368 hunk ./actions/recoverpassword.php 270
 369 -        common_element('p', NULL,
 370 +        common_element('p', null,
 371 hunk ./actions/recoverpassword.php 327
 372 -        common_element('p', NULL, _('New password successfully saved. ' .
 373 +        common_element('p', null, _('New password successfully saved. ' .
 374 hunk ./actions/register.php 152
 375 -    function show_top($error=NULL) {
 376 +    function show_top($error=null) {
 377 hunk ./actions/register.php 167
 378 -    function show_form($error=NULL) {
 379 +    function show_form($error=null) {
 380 hunk ./actions/register.php 181
 381 -        common_show_header(_('Register'), NULL, $error, array($this, 'show_top'));
 382 +        common_show_header(_('Register'), null, $error, array($this, 'show_top'));
 383 hunk ./actions/remotesubscribe.php 58
 384 -    function show_top($err=NULL) {
 385 +    function show_top($err=null) {
 386 hunk ./actions/remotesubscribe.php 70
 387 -    function show_form($err=NULL) {
 388 +    function show_form($err=null) {
 389 hunk ./actions/remotesubscribe.php 73
 390 -        common_show_header(_('Remote subscribe'), NULL, $err,
 391 +        common_show_header(_('Remote subscribe'), null, $err,
 392 hunk ./actions/remotesubscribe.php 156
 393 -        $user = NULL;
 394 +        $user = null;
 395 hunk ./actions/remotesubscribe.php 176
 396 -            return NULL;
 397 +            return null;
 398 hunk ./actions/remotesubscribe.php 184
 399 -            return NULL;
 400 +            return null;
 401 hunk ./actions/remotesubscribe.php 188
 402 -            return NULL;
 403 +            return null;
 404 hunk ./actions/remotesubscribe.php 194
 405 -            return NULL;
 406 +            return null;
 407 hunk ./actions/remotesubscribe.php 202
 408 -            return NULL;
 409 +            return null;
 410 hunk ./actions/remotesubscribe.php 206
 411 -            return NULL;
 412 +            return null;
 413 hunk ./actions/remotesubscribe.php 213
 414 -                return NULL;
 415 +                return null;
 416 hunk ./actions/remotesubscribe.php 218
 417 -            return NULL;
 418 +            return null;
 419 hunk ./actions/remotesubscribe.php 228
 420 -            return NULL;
 421 +            return null;
 422 hunk ./actions/remotesubscribe.php 242
 423 -        return NULL;
 424 +        return null;
 425 hunk ./actions/remotesubscribe.php 270
 426 -        $req = OAuthRequest::from_consumer_and_token($con, NULL, "POST", $url, $params);
 427 +        $req = OAuthRequest::from_consumer_and_token($con, null, "POST", $url, $params);
 428 hunk ./actions/remotesubscribe.php 275
 429 -            return NULL;
 430 +            return null;
 431 hunk ./actions/remotesubscribe.php 283
 432 -        $req->sign_request(omb_hmac_sha1(), $con, NULL);
 433 +        $req->sign_request(omb_hmac_sha1(), $con, null);
 434 hunk ./actions/remotesubscribe.php 294
 435 -            return NULL;
 436 +            return null;
 437 hunk ./actions/repliesrss.php 28
 438 -    var $user = NULL;
 439 +    var $user = null;
 440 hunk ./actions/repliesrss.php 74
 441 -            return NULL;
 442 +            return null;
 443 hunk ./actions/repliesrss.php 77
 444 -        return ($avatar) ? $avatar->url : NULL;
 445 +        return ($avatar) ? $avatar->url : null;
 446 hunk ./actions/showmessage.php 56
 447 -            return NULL;
 448 +            return null;
 449 hunk ./actions/showmessage.php 88
 450 -            return NULL;
 451 +            return null;
 452 hunk ./actions/shownotice.php 26
 453 -    var $notice = NULL;
 454 -    var $profile = NULL;
 455 -    var $avatar = NULL;
 456 +    var $notice = null;
 457 +    var $profile = null;
 458 +    var $avatar = null;
 459 hunk ./actions/shownotice.php 76
 460 -                           array($this, 'show_header'), NULL,
 461 +                           array($this, 'show_header'), null,
 462 hunk ./actions/showstream.php 288
 463 -        common_element('h2', NULL, _('Subscriptions'));
 464 +        common_element('h2', null, _('Subscriptions'));
 465 hunk ./actions/showstream.php 418
 466 -        common_element('h2', NULL, _('Currently'));
 467 +        common_element('h2', null, _('Currently'));
 468 hunk ./actions/smssettings.php 31
 469 -    function show_form($msg=NULL, $success=false) {
 470 +    function show_form($msg=null, $success=false) {
 471 hunk ./actions/smssettings.php 39
 472 -        common_element('h2', NULL, _('Address'));
 473 +        common_element('h2', null, _('Address'));
 474 hunk ./actions/smssettings.php 63
 475 -                common_input('code', _('Confirmation code'), NULL,
 476 +                common_input('code', _('Confirmation code'), null,
 477 hunk ./actions/smssettings.php 68
 478 -                             ($this->arg('sms')) ? $this->arg('sms') : NULL,
 479 +                             ($this->arg('sms')) ? $this->arg('sms') : null,
 480 hunk ./actions/smssettings.php 76
 481 -            common_element('h2', NULL, _('Incoming email'));
 482 +            common_element('h2', null, _('Incoming email'));
 483 hunk ./actions/smssettings.php 94
 484 -        common_element('h2', NULL, _('Preferences'));
 485 +        common_element('h2', null, _('Preferences'));
 486 hunk ./actions/smssettings.php 114
 487 -            return NULL;
 488 +            return null;
 489 hunk ./actions/smssettings.php 271
 490 -        $user->sms = NULL;
 491 -        $user->carrier = NULL;
 492 -        $user->smsemail = NULL;
 493 +        $user->sms = null;
 494 +        $user->carrier = null;
 495 +        $user->smsemail = null;
 496 hunk ./actions/subedit.php 24
 497 -    var $profile = NULL;
 498 +    var $profile = null;
 499 hunk ./actions/tagother.php 52
 500 -    function show_form($profile, $error=NULL) {
 501 +    function show_form($profile, $error=null) {
 502 hunk ./actions/tagother.php 57
 503 -                           NULL, array($profile, $error), array($this, 'show_top'));
 504 +                           null, array($profile, $error), array($this, 'show_top'));
 505 hunk ./actions/tagother.php 181
 506 -    function show_top($arr = NULL) {
 507 +    function show_top($arr = null) {
 508 hunk ./actions/tagother.php 187
 509 -            common_element('p', NULL,
 510 +            common_element('p', null,
 511 hunk ./actions/tagrss.php 44
 512 -            return NULL;
 513 +            return null;
 514 hunk ./actions/twitapidirect_messages.php 231
 515 -        common_element('title', NULL, $title);
 516 +        common_element('title', null, $title);
 517 hunk ./actions/twitapidirect_messages.php 233
 518 -        common_element('link', NULL, $link);
 519 -        common_element('description', NULL, $subtitle);
 520 -        common_element('language', NULL, 'en-us');
 521 -        common_element('ttl', NULL, '40');
 522 +        common_element('link', null, $link);
 523 +        common_element('description', null, $subtitle);
 524 +        common_element('language', null, 'en-us');
 525 +        common_element('ttl', null, '40');
 526 hunk ./actions/twitapidirect_messages.php 259
 527 -        common_element('title', NULL, $title);
 528 +        common_element('title', null, $title);
 529 hunk ./actions/twitapidirect_messages.php 261
 530 -        common_element('id', NULL, "tag:$siteserver,2008:DirectMessage");
 531 -        common_element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), NULL);
 532 -        common_element('updated', NULL, common_date_iso8601(strftime('%c')));
 533 -        common_element('subtitle', NULL, $subtitle);
 534 +        common_element('id', null, "tag:$siteserver,2008:DirectMessage");
 535 +        common_element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), null);
 536 +        common_element('updated', null, common_date_iso8601(strftime('%c')));
 537 +        common_element('subtitle', null, $subtitle);
 538 hunk ./actions/twitapifriendships.php 141
 539 -            common_element('friends', NULL, $result);
 540 +            common_element('friends', null, $result);
 541 hunk ./actions/twitapihelp.php 35
 542 -            common_element('ok', NULL, 'true');
 543 +            common_element('ok', null, 'true');
 544 hunk ./actions/twitapistatuses.php 115
 545 -        $user = $this->get_user(NULL, $apidata);
 546 +        $user = $this->get_user(null, $apidata);
 547 hunk ./actions/twitapistatuses.php 203
 548 -        $suplink = common_local_url('sup', NULL, $user->id);
 549 +        $suplink = common_local_url('sup', null, $user->id);
 550 hunk ./actions/twitapistatuses.php 294
 551 -            $reply_to = NULL;
 552 +            $reply_to = null;
 553 hunk ./actions/twittersettings.php 33
 554 -    function show_form($msg=NULL, $success=false) {
 555 +    function show_form($msg=null, $success=false) {
 556 hunk ./actions/twittersettings.php 36
 557 -        $fuser = NULL;
 558 +        $fuser = null;
 559 hunk ./actions/twittersettings.php 50
 560 -        common_element('h2', NULL, _('Twitter Account'));
 561 +        common_element('h2', null, _('Twitter Account'));
 562 hunk ./actions/twittersettings.php 70
 563 -        common_element('h2', NULL, _('Preferences'));
 564 +        common_element('h2', null, _('Preferences'));
 565 hunk ./actions/twittersettings.php 129
 566 -            common_element('h3', NULL, _('Twitter Friends'));
 567 +            common_element('h3', null, _('Twitter Friends'));
 568 hunk ./actions/unblock.php 24
 569 -    var $profile = NULL;
 570 +    var $profile = null;
 571 hunk ./actions/userauthorization.php 84
 572 -        common_element('p', NULL, _('Please check these details to make sure '.
 573 +        common_element('p', null, _('Please check these details to make sure '.
 574 hunk ./actions/userauthorization.php 323
 575 -        common_element('p', NULL,
 576 +        common_element('p', null,
 577 hunk ./actions/userauthorization.php 333
 578 -        common_element('p', NULL,
 579 +        common_element('p', null,
 580 hunk ./actions/userbyid.php 41
 581 -        $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : NULL;
 582 +        $httpaccept = isset($_SERVER['HTTP_ACCEPT']) ? $_SERVER['HTTP_ACCEPT'] : null;
 583 hunk ./actions/userrss.php 28
 584 -    var $user = NULL;
 585 +    var $user = null;
 586 hunk ./actions/userrss.php 47
 587 -            return NULL;
 588 +            return null;
 589 hunk ./actions/userrss.php 77
 590 -            return NULL;
 591 +            return null;
 592 hunk ./actions/userrss.php 80
 593 -        return ($avatar) ? $avatar->url : NULL;
 594 +        return ($avatar) ? $avatar->url : null;
 595 hunk ./actions/userrss.php 86
 596 -        $url = common_local_url('sup', NULL, $this->user->id);
 597 +        $url = common_local_url('sup', null, $this->user->id);
 598 hunk ./actions/xrds.php 53
 599 -        common_element('Type', NULL, 'xri://$xrds*simple');
 600 +        common_element('Type', null, 'xri://$xrds*simple');
 601 hunk ./actions/xrds.php 72
 602 -                            NULL,
 603 +                            null,
 604 hunk ./actions/xrds.php 85
 605 -        common_element('Type', NULL, 'xri://$xrds*simple');
 606 +        common_element('Type', null, 'xri://$xrds*simple');
 607 hunk ./actions/xrds.php 98
 608 -        common_element('Type', NULL, 'xri://$xrds*simple');
 609 +        common_element('Type', null, 'xri://$xrds*simple');
 610 hunk ./actions/xrds.php 111
 611 -    function show_service($type, $uri, $params=NULL, $sigs=NULL, $localId=NULL) {
 612 +    function show_service($type, $uri, $params=null, $sigs=null, $localId=null) {
 613 hunk ./actions/xrds.php 114
 614 -            common_element('URI', NULL, $uri);
 615 +            common_element('URI', null, $uri);
 616 hunk ./actions/xrds.php 116
 617 -        common_element('Type', NULL, $type);
 618 +        common_element('Type', null, $type);
 619 hunk ./actions/xrds.php 119
 620 -                common_element('Type', NULL, $param);
 621 +                common_element('Type', null, $param);
 622 hunk ./actions/xrds.php 124
 623 -                common_element('Type', NULL, $sig);
 624 +                common_element('Type', null, $sig);
 625 hunk ./actions/xrds.php 128
 626 -            common_element('LocalID', NULL, $localId);
 627 +            common_element('LocalID', null, $localId);
 628 hunk ./classes/Avatar.php 24
 629 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Avatar',$k,$v); }
 630 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Avatar',$k,$v); }
 631 hunk ./classes/Avatar.php 75
 632 -            return NULL;
 633 +            return null;
 634 hunk ./classes/Avatar.php 88
 635 -            return NULL;
 636 +            return null;
 637 hunk ./classes/Channel.php 41
 638 -        return NULL;
 639 +        return null;
 640 hunk ./classes/Channel.php 47
 641 -    var $conn = NULL;
 642 +    var $conn = null;
 643 hunk ./classes/Channel.php 114
 644 -        common_element('p', NULL, $text);
 645 +        common_element('p', null, $text);
 646 hunk ./classes/Channel.php 152
 647 -    var $addr = NULL;
 648 +    var $addr = null;
 649 hunk ./classes/Channel.php 158
 650 -    function __construct($addr=NULL) {
 651 +    function __construct($addr=null) {
 652 hunk ./classes/Command.php 26
 653 -    var $user = NULL;
 654 +    var $user = null;
 655 hunk ./classes/Command.php 28
 656 -    function __construct($user=NULL) {
 657 +    function __construct($user=null) {
 658 hunk ./classes/Command.php 50
 659 -    var $word = NULL;
 660 +    var $word = null;
 661 hunk ./classes/Command.php 58
 662 -    var $word = NULL;
 663 +    var $word = null;
 664 hunk ./classes/Command.php 66
 665 -    var $other = NULL;
 666 +    var $other = null;
 667 hunk ./classes/Command.php 74
 668 -    var $other = NULL;
 669 +    var $other = null;
 670 hunk ./classes/Command.php 107
 671 -    var $other = NULL;
 672 +    var $other = null;
 673 hunk ./classes/Command.php 151
 674 -    var $other = NULL;
 675 +    var $other = null;
 676 hunk ./classes/Command.php 185
 677 -    var $other = NULL;
 678 -    var $text = NULL;
 679 +    var $other = null;
 680 +    var $text = null;
 681 hunk ./classes/Command.php 228
 682 -    var $other = NULL;
 683 +    var $other = null;
 684 hunk ./classes/Command.php 258
 685 -    var $other = NULL;
 686 +    var $other = null;
 687 hunk ./classes/Command.php 284
 688 -    var $other = NULL;
 689 +    var $other = null;
 690 hunk ./classes/Command.php 308
 691 -    var $other = NULL;
 692 -    function __construct($user, $other=NULL) {
 693 +    var $other = null;
 694 +    function __construct($user, $other=null) {
 695 hunk ./classes/Command.php 327
 696 -    var $other = NULL;
 697 -    function __construct($user, $other=NULL) {
 698 +    var $other = null;
 699 +    function __construct($user, $other=null) {
 700 hunk ./classes/CommandInterpreter.php 40
 701 -                return NULL;
 702 +                return null;
 703 hunk ./classes/CommandInterpreter.php 47
 704 -                    return NULL;
 705 +                    return null;
 706 hunk ./classes/CommandInterpreter.php 58
 707 -                    return NULL;
 708 +                    return null;
 709 hunk ./classes/CommandInterpreter.php 68
 710 -                return NULL;
 711 +                return null;
 712 hunk ./classes/CommandInterpreter.php 75
 713 -                return NULL;
 714 +                return null;
 715 hunk ./classes/CommandInterpreter.php 79
 716 -                return NULL;
 717 +                return null;
 718 hunk ./classes/CommandInterpreter.php 86
 719 -                return NULL;
 720 +                return null;
 721 hunk ./classes/CommandInterpreter.php 90
 722 -                return NULL;
 723 +                return null;
 724 hunk ./classes/CommandInterpreter.php 97
 725 -                return NULL;
 726 +                return null;
 727 hunk ./classes/CommandInterpreter.php 101
 728 -                return NULL;
 729 +                return null;
 730 hunk ./classes/CommandInterpreter.php 107
 731 -                return NULL;
 732 +                return null;
 733 hunk ./classes/CommandInterpreter.php 111
 734 -                return NULL;
 735 +                return null;
 736 hunk ./classes/CommandInterpreter.php 117
 737 -                return NULL;
 738 +                return null;
 739 hunk ./classes/CommandInterpreter.php 121
 740 -                return NULL;
 741 +                return null;
 742 hunk ./classes/CommandInterpreter.php 127
 743 -                return NULL;
 744 +                return null;
 745 hunk ./classes/CommandInterpreter.php 131
 746 -                return NULL;
 747 +                return null;
 748 hunk ./classes/CommandInterpreter.php 137
 749 -                return NULL;
 750 +                return null;
 751 hunk ./classes/CommandInterpreter.php 141
 752 -                return NULL;
 753 +                return null;
 754 hunk ./classes/CommandInterpreter.php 147
 755 -                return NULL;
 756 +                return null;
 757 hunk ./classes/CommandInterpreter.php 152
 758 -                return NULL;
 759 +                return null;
 760 hunk ./classes/CommandInterpreter.php 156
 761 -                return NULL;
 762 +                return null;
 763 hunk ./classes/CommandInterpreter.php 162
 764 -                return NULL;
 765 +                return null;
 766 hunk ./classes/CommandInterpreter.php 166
 767 -                return NULL;
 768 +                return null;
 769 hunk ./classes/CommandInterpreter.php 174
 770 -                return NULL;
 771 +                return null;
 772 hunk ./classes/CommandInterpreter.php 178
 773 -                return NULL;
 774 +                return null;
 775 hunk ./classes/CommandInterpreter.php 187
 776 -                return NULL;
 777 +                return null;
 778 hunk ./classes/Confirm_address.php 23
 779 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Confirm_address',$k,$v); }
 780 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Confirm_address',$k,$v); }
 781 hunk ./classes/Consumer.php 19
 782 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Consumer',$k,$v); }
 783 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Consumer',$k,$v); }
 784 hunk ./classes/Fave.php 18
 785 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Fave',$k,$v); }
 786 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Fave',$k,$v); }
 787 hunk ./classes/Foreign_link.php 24
 788 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Foreign_link',$k,$v); }
 789 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Foreign_link',$k,$v); }
 790 hunk ./classes/Foreign_link.php 41
 791 -        return NULL;
 792 +        return null;
 793 hunk ./classes/Foreign_link.php 54
 794 -        return NULL;
 795 +        return null;
 796 hunk ./classes/Foreign_link.php 69
 797 -        return NULL;
 798 +        return null;
 799 hunk ./classes/Foreign_service.php 20
 800 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Foreign_service',$k,$v); }
 801 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Foreign_service',$k,$v); }
 802 hunk ./classes/Foreign_subscription.php 19
 803 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Foreign_subscription',$k,$v); }
 804 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Foreign_subscription',$k,$v); }
 805 hunk ./classes/Foreign_user.php 21
 806 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Foreign_user',$k,$v); }
 807 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Foreign_user',$k,$v); }
 808 hunk ./classes/Foreign_user.php 39
 809 -        return NULL;
 810 +        return null;
 811 hunk ./classes/Invitation.php 20
 812 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Invitation',$k,$v); }
 813 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Invitation',$k,$v); }
 814 hunk ./classes/Memcached_DataObject.php 26
 815 -    function &staticGet($cls, $k, $v=NULL) {
 816 +    function &staticGet($cls, $k, $v=null) {
 817 hunk ./classes/Memcached_DataObject.php 59
 818 -                $i = NULL;
 819 +                $i = null;
 820 hunk ./classes/Memcached_DataObject.php 70
 821 -    function update($orig=NULL) {
 822 +    function update($orig=null) {
 823 hunk ./classes/Message.php 25
 824 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Message',$k,$v); }
 825 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Message',$k,$v); }
 826 hunk ./classes/Nonce.php 21
 827 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Nonce',$k,$v); }
 828 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Nonce',$k,$v); }
 829 hunk ./classes/Notice.php 51
 830 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Notice',$k,$v); }
 831 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Notice',$k,$v); }
 832 hunk ./classes/Notice.php 94
 833 -    static function saveNew($profile_id, $content, $source=NULL, $is_local=1, $reply_to=NULL, $uri=NULL) {
 834 +    static function saveNew($profile_id, $content, $source=null, $is_local=1, $reply_to=null, $uri=null) {
 835 hunk ./classes/Notice.php 296
 836 -    static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $order=NULL, $since=NULL) {
 837 +    static function getStream($qry, $cachekey, $offset=0, $limit=20, $since_id=0, $before_id=0, $order=null, $since=null) {
 838 hunk ./classes/Notice.php 386
 839 -            return Notice::getStreamDirect($qry, $offset, $limit, NULL, NULL, $order, NULL);
 840 +            return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
 841 hunk ./classes/Notice.php 394
 842 -            return Notice::getStreamDirect($qry, $offset, $limit, NULL, NULL, $order, NULL);
 843 +            return Notice::getStreamDirect($qry, $offset, $limit, null, null, $order, null);
 844 hunk ./classes/Notice.php 426
 845 -                                                  $last_id, NULL, $order, NULL);
 846 +                                                  $last_id, null, $order, null);
 847 hunk ./classes/Notice.php 450
 848 -        $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, NULL, NULL, $order, NULL);
 849 +        $notice = Notice::getStreamDirect($qry, 0, NOTICE_CACHE_WINDOW, null, null, $order, null);
 850 hunk ./classes/Notice.php 480
 851 -    function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=NULL) {
 852 +    function publicStream($offset=0, $limit=20, $since_id=0, $before_id=0, $since=null) {
 853 hunk ./classes/Notice.php 499
 854 -                                 $offset, $limit, $since_id, $before_id, NULL, $since);
 855 +                                 $offset, $limit, $since_id, $before_id, null, $since);
 856 hunk ./classes/NoticeWrapper.php 38
 857 -    var $notices = NULL;
 858 +    var $notices = null;
 859 hunk ./classes/Notice_inbox.php 36
 860 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Notice_inbox',$k,$v); }
 861 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Notice_inbox',$k,$v); }
 862 hunk ./classes/Notice_source.php 20
 863 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Notice_source',$k,$v); }
 864 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Notice_source',$k,$v); }
 865 hunk ./classes/Notice_tag.php 33
 866 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Notice_tag',$k,$v); }
 867 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Notice_tag',$k,$v); }
 868 hunk ./classes/Profile.php 44
 869 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile',$k,$v); }
 870 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Profile',$k,$v); }
 871 hunk ./classes/Profile.php 49
 872 -    function getAvatar($width, $height=NULL) {
 873 +    function getAvatar($width, $height=null) {
 874 hunk ./classes/Profile.php 65
 875 -            return NULL;
 876 +            return null;
 877 hunk ./classes/Profile.php 74
 878 -            return NULL;
 879 +            return null;
 880 hunk ./classes/Profile.php 79
 881 -                                           NULL, common_timestamp());
 882 +                                           null, common_timestamp());
 883 hunk ./classes/Profile.php 99
 884 -            return NULL;
 885 +            return null;
 886 hunk ./classes/Profile.php 104
 887 -            return NULL;
 888 +            return null;
 889 hunk ./classes/Profile.php 112
 890 -                    return NULL;
 891 +                    return null;
 892 hunk ./classes/Profile.php 135
 893 -    function getCurrentNotice($dt=NULL) {
 894 +    function getCurrentNotice($dt=null) {
 895 hunk ./classes/Profile.php 146
 896 -        return NULL;
 897 +        return null;
 898 hunk ./classes/Profile_block.php 39
 899 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
 900 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Profile_block',$k,$v); }
 901 hunk ./classes/Profile_tag.php 19
 902 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile_tag',$k,$v); }
 903 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Profile_tag',$k,$v); }
 904 hunk ./classes/Queue_item.php 19
 905 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
 906 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Queue_item',$k,$v); }
 907 hunk ./classes/Queue_item.php 31
 908 -        $qi->whereAdd('claimed is NULL');
 909 +        $qi->whereAdd('claimed is null');
 910 hunk ./classes/Queue_item.php 39
 911 -            # can we force it to only update if claimed is still NULL
 912 +            # can we force it to only update if claimed is still null
 913 hunk ./classes/Queue_item.php 52
 914 -        $qi = NULL;
 915 -        return NULL;
 916 +        $qi = null;
 917 +        return null;
 918 hunk ./classes/Remember_me.php 18
 919 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Remember_me',$k,$v); }
 920 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Remember_me',$k,$v); }
 921 hunk ./classes/Remote_profile.php 41
 922 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Remote_profile',$k,$v); }
 923 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Remote_profile',$k,$v); }
 924 hunk ./classes/Reply.php 19
 925 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Reply',$k,$v); }
 926 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Reply',$k,$v); }
 927 hunk ./classes/Sms_carrier.php 20
 928 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Sms_carrier',$k,$v); }
 929 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Sms_carrier',$k,$v); }
 930 hunk ./classes/Subscription.php 43
 931 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Subscription',$k,$v); }
 932 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Subscription',$k,$v); }
 933 hunk ./classes/Token.php 22
 934 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Token',$k,$v); }
 935 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('Token',$k,$v); }
 936 hunk ./classes/User.php 65
 937 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User',$k,$v); }
 938 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('User',$k,$v); }
 939 hunk ./classes/User.php 121
 940 -    function getCurrentNotice($dt=NULL) {
 941 +    function getCurrentNotice($dt=null) {
 942 hunk ./classes/User.php 124
 943 -            return NULL;
 944 +            return null;
 945 hunk ./classes/User.php 339
 946 -    function getReplies($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=NULL) {
 947 +    function getReplies($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) {
 948 hunk ./classes/User.php 346
 949 -                                 $offset, $limit, $since_id, $before_id, NULL, $since);
 950 +                                 $offset, $limit, $since_id, $before_id, null, $since);
 951 hunk ./classes/User.php 349
 952 -        function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=NULL) {
 953 +        function getNotices($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) {
 954 hunk ./classes/User.php 352
 955 -            return NULL;
 956 +            return null;
 957 hunk ./classes/User.php 368
 958 -        function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=NULL) {
 959 +        function noticesWithFriends($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null) {
 960 hunk ./classes/User.php 380
 961 -            $order = NULL;
 962 +            $order = null;
 963 hunk ./classes/User_openid.php 20
 964 -    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User_openid',$k,$v); }
 965 +    function staticGet($k,$v=null) { return Memcached_DataObject::staticGet('User_openid',$k,$v); }
 966 hunk ./lib/common.php 61
 967 -              'logfile' => NULL,
 968 +              'logfile' => null,
 969 hunk ./lib/common.php 67
 970 -              array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : NULL,
 971 -              'broughtby' => NULL,
 972 +              array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null,
 973 +              'broughtby' => null,
 974 hunk ./lib/common.php 70
 975 -              'broughtbyurl' => NULL,
 976 +              'broughtbyurl' => null,
 977 hunk ./lib/common.php 85
 978 -              'params' => NULL),
 979 +              'params' => null),
 980 hunk ./lib/common.php 92
 981 -        array('server' => NULL),
 982 +        array('server' => null),
 983 hunk ./lib/common.php 97
 984 -        array('server' => NULL),
 985 +        array('server' => null),
 986 hunk ./lib/common.php 110
 987 -              'host' => NULL, # only set if != server
 988 +              'host' => null, # only set if != server
 989 hunk ./lib/common.php 143
 990 -        'mirror' => NULL,
 991 +        'mirror' => null,
 992 hunk ./lib/deleteaction.php 46
 993 -    function show_top($arr=NULL) {
 994 +    function show_top($arr=null) {
 995 hunk ./lib/deleteaction.php 55
 996 -        return NULL;
 997 +        return null;
 998 hunk ./lib/facebookaction.php 84
 999 -        $facebook->api_client->profile_setFBML(NULL, $fbuid, $fbml, NULL, NULL, $fbml_main);
1000 +        $facebook->api_client->profile_setFBML(null, $fbuid, $fbml, null, null, $fbml_main);
1001 hunk ./lib/facebookaction.php 238
1002 -    function pagination($have_before, $have_after, $page, $fbaction, $args=NULL) {
1003 +    function pagination($have_before, $have_after, $page, $fbaction, $args=null) {
1004 hunk ./lib/facebookaction.php 269
1005 -    function pagination_url($fbaction, $args=NULL) {
1006 +    function pagination_url($fbaction, $args=null) {
1007 hunk ./lib/oauthstore.php 36
1008 -                return NULL;
1009 +                return null;
1010 hunk ./lib/oauthstore.php 50
1011 -            return NULL;
1012 +            return null;
1013 hunk ./lib/oauthstore.php 78
1014 -            return NULL;
1015 +            return null;
1016 hunk ./lib/oauthstore.php 107
1017 -                return NULL;
1018 +                return null;
1019 hunk ./lib/oauthstore.php 114
1020 -                    return NULL;
1021 +                    return null;
1022 hunk ./lib/oauthstore.php 121
1023 -                    return NULL;
1024 +                    return null;
1025 hunk ./lib/oauthstore.php 128
1026 -                    return NULL;
1027 +                    return null;
1028 hunk ./lib/oauthstore.php 135
1029 -            return NULL;
1030 +            return null;
1031 hunk ./lib/omb.php 47
1032 -    static $con = NULL;
1033 +    static $con = null;
1034 hunk ./lib/omb.php 64
1035 -    static $store = NULL;
1036 +    static $store = null;
1037 hunk ./lib/omb.php 72
1038 -    static $hmac_method = NULL;
1039 +    static $hmac_method = null;
1040 hunk ./lib/omb.php 94
1041 -        return NULL;
1042 +        return null;
1043 hunk ./lib/omb.php 98
1044 -        return NULL;
1045 +        return null;
1046 hunk ./lib/omb.php 105
1047 -        return NULL;
1048 +        return null;
1049 hunk ./lib/omb.php 109
1050 -        return NULL;
1051 +        return null;
1052 hunk ./lib/openid.php 35
1053 -    static $store = NULL;
1054 +    static $store = null;
1055 hunk ./lib/openid.php 66
1056 -        return NULL;
1057 +        return null;
1058 hunk ./lib/openid.php 88
1059 -    $user = NULL;
1060 +    $user = null;
1061 hunk ./lib/openid.php 96
1062 -function oid_check_immediate($openid_url, $backto=NULL) {
1063 +function oid_check_immediate($openid_url, $backto=null) {
1064 hunk ./lib/openid.php 180
1065 -            common_show_header(_('OpenID Auto-Submit'), NULL, NULL, '_oid_print_instructions');
1066 +            common_show_header(_('OpenID Auto-Submit'), null, null, '_oid_print_instructions');
1067 hunk ./lib/openid.php 182
1068 -            common_element('script', NULL,
1069 +            common_element('script', null,
1070 hunk ./lib/personal.php 35
1071 -        $user = NULL;
1072 +        $user = null;
1073 hunk ./lib/profilelist.php 27
1074 -    var $profile = NULL;
1075 -    var $owner = NULL;
1076 -    var $action = NULL;
1077 +    var $profile = null;
1078 +    var $owner = null;
1079 +    var $action = null;
1080 hunk ./lib/profilelist.php 31
1081 -    function __construct($profile, $owner=NULL, $action=NULL) {
1082 +    function __construct($profile, $owner=null, $action=null) {
1083 hunk ./lib/queuehandler.php 32
1084 -    function QueueHandler($id=NULL) {
1085 +    function QueueHandler($id=null) {
1086 hunk ./lib/queuehandler.php 55
1087 -        return NULL;
1088 +        return null;
1089 hunk ./lib/queuehandler.php 86
1090 -                        $qi->claimed = NULL;
1091 +                        $qi->claimed = null;
1092 hunk ./lib/queuehandler.php 94
1093 -                    $notice = NULL;
1094 +                    $notice = null;
1095 hunk ./lib/rssaction.php 58
1096 -        return NULL;
1097 +        return null;
1098 hunk ./lib/rssaction.php 87
1099 -        common_element('title', NULL, $channel['title']);
1100 -        common_element('link', NULL, $channel['link']);
1101 -        common_element('description', NULL, $channel['description']);
1102 +        common_element('title', null, $channel['title']);
1103 +        common_element('link', null, $channel['link']);
1104 +        common_element('description', null, $channel['description']);
1105 hunk ./lib/rssaction.php 114
1106 -            common_element('title', NULL, $channel['title']);
1107 -            common_element('link', NULL, $channel['link']);
1108 -            common_element('url', NULL, $image);
1109 +            common_element('title', null, $channel['title']);
1110 +            common_element('link', null, $channel['link']);
1111 +            common_element('url', null, $image);
1112 hunk ./lib/rssaction.php 127
1113 -        common_element('title', NULL, $title);
1114 -        common_element('link', NULL, $nurl);
1115 -        common_element('description', NULL, $profile->nickname."'s status on ".common_exact_date($notice->created));
1116 -        common_element('dc:date', NULL, common_date_w3dtf($notice->created));
1117 -        common_element('dc:creator', NULL, ($profile->fullname) ? $profile->fullname : $profile->nickname);
1118 +        common_element('title', null, $title);
1119 +        common_element('link', null, $nurl);
1120 +        common_element('description', null, $profile->nickname."'s status on ".common_exact_date($notice->created));
1121 +        common_element('dc:date', null, common_date_w3dtf($notice->created));
1122 +        common_element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname);
1123 hunk ./lib/rssaction.php 144
1124 -            common_element('foaf:nick', NULL, $nickname);
1125 +            common_element('foaf:nick', null, $nickname);
1126 hunk ./lib/rssaction.php 146
1127 -                common_element('foaf:name', NULL, $profile->fullname);
1128 +                common_element('foaf:name', null, $profile->fullname);
1129 hunk ./lib/rssaction.php 148
1130 -            common_element('sioc:id', NULL, $id);
1131 +            common_element('sioc:id', null, $id);
1132 hunk ./lib/rssaction.php 178
1133 -        common_element('sioc:name', NULL, common_config('site', 'name'));
1134 +        common_element('sioc:name', null, common_config('site', 'name'));
1135 hunk ./lib/searchaction.php 33
1136 -    function show_top($arr=NULL) {
1137 +    function show_top($arr=null) {
1138 hunk ./lib/searchaction.php 50
1139 -        return NULL;
1140 +        return null;
1141 hunk ./lib/searchaction.php 57
1142 -    function show_form($error=NULL) {
1143 +    function show_form($error=null) {
1144 hunk ./lib/searchaction.php 102
1145 -                      ($action != 'peoplesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL),
1146 +                      ($action != 'peoplesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : null),
1147 hunk ./lib/searchaction.php 106
1148 -                       ($action != 'noticesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : NULL)
1149 +                       ($action != 'noticesearch' && $this->trimmed('q')) ? array('q' => $this->trimmed('q')) : null)
1150 hunk ./lib/settingsaction.php 47
1151 -    function show_form($msg=NULL, $success=false) {
1152 +    function show_form($msg=null, $success=false) {
1153 hunk ./lib/settingsaction.php 58
1154 -    function form_header($title, $msg=NULL, $success=false) {
1155 +    function form_header($title, $msg=null, $success=false) {
1156 hunk ./lib/settingsaction.php 60
1157 -                           NULL,
1158 +                           null,
1159 hunk ./lib/twitter.php 151
1160 -            return NULL;
1161 +            return null;
1162 hunk ./lib/twitter.php 157
1163 -            return NULL;
1164 +            return null;
1165 hunk ./lib/twitterapi.php 37
1166 -        $twitter_user['description'] = ($profile->bio) ? $profile->bio : NULL;
1167 -        $twitter_user['location'] = ($profile->location) ? $profile->location : NULL;
1168 +        $twitter_user['description'] = ($profile->bio) ? $profile->bio : null;
1169 +        $twitter_user['location'] = ($profile->location) ? $profile->location : null;
1170 hunk ./lib/twitterapi.php 45
1171 -        $twitter_user['url'] = ($profile->homepage) ? $profile->homepage : NULL;
1172 +        $twitter_user['url'] = ($profile->homepage) ? $profile->homepage : null;
1173 hunk ./lib/twitterapi.php 66
1174 -        $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ? intval($notice->reply_to) : NULL;
1175 +        $twitter_status['in_reply_to_status_id'] = ($notice->reply_to) ? intval($notice->reply_to) : null;
1176 hunk ./lib/twitterapi.php 69
1177 -        $twitter_status['in_reply_to_user_id'] = ($notice->reply_to) ? $this->replier_by_reply(intval($notice->reply_to)) : NULL;
1178 +        $twitter_status['in_reply_to_user_id'] = ($notice->reply_to) ? $this->replier_by_reply(intval($notice->reply_to)) : null;
1179 hunk ./lib/twitterapi.php 160
1180 -                common_element($element, NULL, common_xml_safe_str($value));
1181 +                common_element($element, null, common_xml_safe_str($value));
1182 hunk ./lib/twitterapi.php 163
1183 -                common_element($element, NULL, $value);
1184 +                common_element($element, null, $value);
1185 hunk ./lib/twitterapi.php 175
1186 -                common_element($element, NULL, $value);
1187 +                common_element($element, null, $value);
1188 hunk ./lib/twitterapi.php 183
1189 -        common_element('title', NULL, $entry['title']);
1190 -        common_element('description', NULL, $entry['description']);
1191 -        common_element('pubDate', NULL, $entry['pubDate']);
1192 -        common_element('guid', NULL, $entry['guid']);
1193 -        common_element('link', NULL, $entry['link']);
1194 +        common_element('title', null, $entry['title']);
1195 +        common_element('description', null, $entry['description']);
1196 +        common_element('pubDate', null, $entry['pubDate']);
1197 +        common_element('guid', null, $entry['guid']);
1198 +        common_element('link', null, $entry['link']);
1199 hunk ./lib/twitterapi.php 193
1200 -        common_element('title', NULL, $entry['title']);
1201 +        common_element('title', null, $entry['title']);
1202 hunk ./lib/twitterapi.php 195
1203 -        common_element('id', NULL, $entry['id']);
1204 -        common_element('published', NULL, $entry['published']);
1205 -        common_element('updated', NULL, $entry['updated']);
1206 -        common_element('link', array('href' => $entry['link'], 'rel' => 'alternate', 'type' => 'text/html'), NULL);
1207 +        common_element('id', null, $entry['id']);
1208 +        common_element('published', null, $entry['published']);
1209 +        common_element('updated', null, $entry['updated']);
1210 +        common_element('link', array('href' => $entry['link'], 'rel' => 'alternate', 'type' => 'text/html'), null);
1211 hunk ./lib/twitterapi.php 243
1212 -                common_element($element, NULL, common_xml_safe_str($value));
1213 +                common_element($element, null, common_xml_safe_str($value));
1214 hunk ./lib/twitterapi.php 246
1215 -                common_element($element, NULL, $value);
1216 +                common_element($element, null, $value);
1217 hunk ./lib/twitterapi.php 273
1218 -    function show_rss_timeline($notice, $title, $link, $subtitle, $suplink=NULL) {
1219 +    function show_rss_timeline($notice, $title, $link, $subtitle, $suplink=null) {
1220 hunk ./lib/twitterapi.php 278
1221 -        common_element('title', NULL, $title);
1222 -        common_element('link', NULL, $link);
1223 +        common_element('title', null, $title);
1224 +        common_element('link', null, $link);
1225 hunk ./lib/twitterapi.php 287
1226 -        common_element('description', NULL, $subtitle);
1227 -        common_element('language', NULL, 'en-us');
1228 -        common_element('ttl', NULL, '40');
1229 +        common_element('description', null, $subtitle);
1230 +        common_element('language', null, 'en-us');
1231 +        common_element('ttl', null, '40');
1232 hunk ./lib/twitterapi.php 307
1233 -    function show_atom_timeline($notice, $title, $id, $link, $subtitle=NULL, $suplink=NULL) {
1234 +    function show_atom_timeline($notice, $title, $id, $link, $subtitle=null, $suplink=null) {
1235 hunk ./lib/twitterapi.php 311
1236 -        common_element('title', NULL, $title);
1237 -        common_element('id', NULL, $id);
1238 -        common_element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), NULL);
1239 +        common_element('title', null, $title);
1240 +        common_element('id', null, $id);
1241 +        common_element('link', array('href' => $link, 'rel' => 'alternate', 'type' => 'text/html'), null);
1242 hunk ./lib/twitterapi.php 320
1243 -        common_element('subtitle', NULL, $subtitle);
1244 +        common_element('subtitle', null, $subtitle);
1245 hunk ./lib/twitterapi.php 380
1246 -        return NULL;
1247 +        return null;
1248 hunk ./lib/twitterapi.php 491
1249 -            common_element('error', NULL, $msg);
1250 -            common_element('request', NULL, $_SERVER['REQUEST_URI']);
1251 +            common_element('error', null, $msg);
1252 +            common_element('request', null, $_SERVER['REQUEST_URI']);
1253 hunk ./lib/twitterapi.php 524
1254 -    function show_profile($profile, $content_type='xml', $notice=NULL) {
1255 +    function show_profile($profile, $content_type='xml', $notice=null) {
1256 hunk ./lib/twitterapi.php 540
1257 -    function get_user($id, $apidata=NULL) {
1258 +    function get_user($id, $apidata=null) {
1259 hunk ./lib/twitterapi.php 559
1260 -                return NULL;
1261 +                return null;
1262 hunk ./lib/xmppqueuehandler.php 41
1263 -            jabber_send_presence("Send me a message to post a notice", 'available', NULL, 'available', -1);
1264 +            jabber_send_presence("Send me a message to post a notice", 'available', null, 'available', -1);
1265 hunk ./lib/xmppqueuehandler.php 48
1266 -        $this->conn->presence(NULL, 'available', NULL, 'available', -1);
1267 +        $this->conn->presence(null, 'available', null, 'available', -1);
1268 hunk ./lib/xmppqueuehandler.php 74
1269 -        $this->conn->message($this->listener(), $pl['body'], 'chat', NULL, $this->ofrom($pl['from']));
1270 +        $this->conn->message($this->listener(), $pl['body'], 'chat', null, $this->ofrom($pl['from']));
1271 hunk ./scripts/enjitqueuehandler.php 120
1272 -$id = ($argc > 1) ? $argv[1] : NULL;
1273 +$id = ($argc > 1) ? $argv[1] : null;
1274 hunk ./scripts/fixup_inboxes.php 37
1275 -$start_at = ($argc > 1) ? $argv[1] : NULL;
1276 +$start_at = ($argc > 1) ? $argv[1] : null;
1277 hunk ./scripts/fixup_notices_rendered.php 34
1278 -$start_at = ($argc > 1) ? $argv[1] : NULL;
1279 +$start_at = ($argc > 1) ? $argv[1] : null;
1280 hunk ./scripts/jabberqueuehandler.php 38
1281 -    var $conn = NULL;
1282 +    var $conn = null;
1283 hunk ./scripts/maildaemon.php 45
1284 -            $this->error(NULL, _('Could not parse message.'));
1285 +            $this->error(null, _('Could not parse message.'));
1286 hunk ./scripts/maildaemon.php 77
1287 -            return NULL;
1288 +            return null;
1289 hunk ./scripts/maildaemon.php 143
1290 -            return NULL;
1291 +            return null;
1292 hunk ./scripts/maildaemon.php 170
1293 -        $this->error(NULL, "Unsupported message type: " . $type);
1294 +        $this->error(null, "Unsupported message type: " . $type);
1295 hunk ./scripts/ombqueuehandler.php 70
1296 -$id = ($argc > 1) ? $argv[1] : NULL;
1297 +$id = ($argc > 1) ? $argv[1] : null;
1298 hunk ./scripts/smsqueuehandler.php 60
1299 -$id = ($argc > 1) ? $argv[1] : NULL;
1300 +$id = ($argc > 1) ? $argv[1] : null;
1301 hunk ./scripts/xmppconfirmhandler.php 104
1302 -        $confirm->whereAdd('claimed IS NULL');
1303 -        $confirm->whereAdd('sent IS NULL');
1304 +        $confirm->whereAdd('claimed IS null');
1305 +        $confirm->whereAdd('sent IS null');
1306 hunk ./scripts/xmppconfirmhandler.php 125
1307 -        return NULL;
1308 +        return null;
1309 hunk ./scripts/xmppconfirmhandler.php 130
1310 -        $confirm->claimed = NULL;
1311 +        $confirm->claimed = null;
1312 hunk ./scripts/xmppdaemon.php 42
1313 -    function XMPPDaemon($resource=NULL) {
1314 +    function XMPPDaemon($resource=null) {
1315 hunk ./scripts/xmppdaemon.php 74
1316 -                             NULL, 'available', 100);
1317 +                             null, 'available', 100);
1318 hunk ./scripts/xmppdaemon.php 95
1319 -        $this->conn->presence('Send me a message to post a notice', 'available', NULL, 'available', 100);
1320 +        $this->conn->presence('Send me a message to post a notice', 'available', null, 'available', 100);
1321 hunk ./scripts/xmppdaemon.php 168
1322 -            return NULL;
1323 +            return null;
1324 hunk ./scripts/xmppdaemon.php 173
1325 -            return NULL;
1326 +            return null;
1327 hunk ./scripts/xmppdaemon.php 177
1328 -            return NULL;
1329 +            return null;
1330 hunk ./scripts/xmppdaemon.php 182
1331 -            return NULL;
1332 +            return null;
1333 hunk ./scripts/xmppdaemon.php 186
1334 -            return NULL;
1335 +            return null;
1336 hunk ./scripts/xmppdaemon.php 191
1337 -            return NULL;
1338 +            return null;