Skip to content

Commit 0e60f9d

Browse files
author
Kevin Wood-Friend
committed
Converted space indentation to tabs
1 parent c08b4fe commit 0e60f9d

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

application/libraries/Format.php

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -119,26 +119,26 @@ public function to_xml($data = null, $structure = null, $basenode = 'xml')
119119

120120
// no numeric keys in our xml please!
121121
if (is_numeric($key))
122-
{
123-
// make string key...
124-
$key = (singular($basenode) != $basenode) ? singular($basenode) : 'item';
125-
}
122+
{
123+
// make string key...
124+
$key = (singular($basenode) != $basenode) ? singular($basenode) : 'item';
125+
}
126126

127127
// replace anything not alpha numeric
128128
$key = preg_replace('/[^a-z_\-0-9]/i', '', $key);
129129

130-
// if there is another array found recursively call this function
131-
if (is_array($value) || is_object($value))
132-
{
133-
$node = $structure->addChild($key);
130+
// if there is another array found recursively call this function
131+
if (is_array($value) || is_object($value))
132+
{
133+
$node = $structure->addChild($key);
134134

135-
// recursive call.
136-
$this->to_xml($value, $node, $key);
137-
}
135+
// recursive call.
136+
$this->to_xml($value, $node, $key);
137+
}
138138

139-
else
140-
{
141-
// add single node.
139+
else
140+
{
141+
// add single node.
142142
$value = htmlspecialchars(html_entity_decode($value, ENT_QUOTES, 'UTF-8'), ENT_QUOTES, "UTF-8");
143143

144144
$structure->addChild($key, $value);
@@ -221,7 +221,7 @@ public function to_serialized()
221221
// Output as a string representing the PHP structure
222222
public function to_php()
223223
{
224-
return var_export($this->_data, TRUE);
224+
return var_export($this->_data, TRUE);
225225
}
226226

227227
// Format XML for output

application/libraries/REST_Controller.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,10 +541,10 @@ protected function _detect_method()
541541
{
542542
$method = strtolower($this->input->post('_method'));
543543
}
544-
else if ($this->input->server('HTTP_X_HTTP_METHOD_OVERRIDE'))
545-
{
546-
$method = strtolower($this->input->server('HTTP_X_HTTP_METHOD_OVERRIDE'));
547-
}
544+
elseif ($this->input->server('HTTP_X_HTTP_METHOD_OVERRIDE'))
545+
{
546+
$method = strtolower($this->input->server('HTTP_X_HTTP_METHOD_OVERRIDE'));
547+
}
548548
}
549549

550550
if (in_array($method, array('get', 'delete', 'post', 'put')))

0 commit comments

Comments
 (0)