Mercurial > defr > drupal > scald > dnd
comparison dnd.module @ 6:ea5d7834d0dc
Added type check to json parsing.
| author | David Eads <eads@chicagotech.org> |
|---|---|
| date | Thu, 19 Feb 2009 14:04:31 -0500 |
| parents | c2eb995212bf |
| children | e6378dbabe45 |
comparison
equal
deleted
inserted
replaced
| 5:dd05863db31c | 6:ea5d7834d0dc |
|---|---|
| 118 | 118 |
| 119 // Handle both relative and absolute urls | 119 // Handle both relative and absolute urls |
| 120 if (!isset($url['scheme'])) { | 120 if (!isset($url['scheme'])) { |
| 121 $settings['url'] = $base_url .'/'. $settings['url']; | 121 $settings['url'] = $base_url .'/'. $settings['url']; |
| 122 } | 122 } |
| 123 dpm($settings); | |
| 123 | 124 |
| 124 $request = drupal_http_request($settings['url']); | 125 $request = drupal_http_request($settings['url']); |
| 125 | 126 |
| 126 // We must remove some Drupal escaping | 127 // We must remove some Drupal escaping |
| 127 $json = json_decode(str_replace(array('\x3c', '\x3e', '\x26'), array("<", ">", "&"), $request->data), TRUE); | 128 $json = json_decode(str_replace(array('\x3c', '\x3e', '\x26'), array("<", ">", "&"), $request->data), TRUE); |
