Permalink
Browse files

Merge branch 'cleaning-up' of github.com:stamen/paperwalking into cle…

…aning-up
  • Loading branch information...
2 parents 6c9535f + e322ca6 commit e3d7210571cc9ec7ee1dfc76b85f6e49abd9250f Michael Lawrence Evans committed Feb 14, 2012
Showing with 5 additions and 2 deletions.
  1. +4 −1 site/lib/data.php
  2. +1 −1 site/lib/output.php
View
@@ -12,6 +12,9 @@
if(!function_exists('imagecreatefromstring'))
die_with_code(500, "Missing function imagecreatefromstring from PHP image processing and GD library");
+ // suppress PHP notices, they are annoying.
+ error_reporting(error_reporting() & ~E_NOTICE);
+
define('STEP_UPLOADING', 0);
define('STEP_QUEUED', 1);
define('STEP_SIFTING', 2);
@@ -86,7 +89,7 @@ function read_userdata($signed_string, $accept_language_header)
* If the single argument is one of "html" or "xml", just return
* what's appropriate without pretending it's a full header.
*/
- function get_preferred_type($accept_type_header, $acceptable_types)
+ function get_preferred_type($accept_type_header, $acceptable_types=null)
{
$acceptable_types = is_array($acceptable_types)
? $acceptable_types
View
@@ -186,7 +186,7 @@ function modify_scan_for_geojson($scan, $print)
return compact('type', 'id', 'geometry', 'properties');
}
- function enforce_master_on_off_switch($language)
+ function enforce_master_on_off_switch($language='en')
{
if(defined('MASTER_ON_OFF_SWITCH') and MASTER_ON_OFF_SWITCH)
return;

0 comments on commit e3d7210

Please sign in to comment.