diff options
| author | Evan Prodromou <evan@prodromou.name> | 2008-12-30 16:22:02 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@prodromou.name> | 2008-12-30 16:22:02 -0500 |
| commit | d57c06b4171fbed9f059c53d66f6b313d9303d6d (patch) | |
| tree | e811408e7eb16567c3841107a796be4323fcb04c | |
| parent | 76d91a358bc072274953c2aaf8a768c331ac2a71 (diff) | |
wrapper element for config.xml
darcs-hash:20081230212202-84dde-d6439ad7061a56c9de0168ced3d95436ca20cb59.gz
| -rw-r--r-- | _darcs/inventory | 4 | ||||
| -rw-r--r-- | _darcs/patches/20081230212202-84dde-d6439ad7061a56c9de0168ced3d95436ca20cb59.gz | bin | 0 -> 172 bytes | |||
| -rw-r--r-- | _darcs/pristine/actions/twitapilaconica.php | 2 | ||||
| -rw-r--r-- | _darcs/tentative_pristine | 15 | ||||
| -rw-r--r-- | actions/twitapilaconica.php | 2 |
5 files changed, 11 insertions, 12 deletions
diff --git a/_darcs/inventory b/_darcs/inventory index 6b875d2ae..e7100599a 100644 --- a/_darcs/inventory +++ b/_darcs/inventory @@ -110,4 +110,6 @@ Evan Prodromou <evan@prodromou.name>**20081230210114] [implement the api/laconica/config method Evan Prodromou <evan@prodromou.name>**20081230211444] [better serialization of arrays and booleans in config output -Evan Prodromou <evan@prodromou.name>**20081230211957]
\ No newline at end of file +Evan Prodromou <evan@prodromou.name>**20081230211957] +[wrapper element for config.xml +Evan Prodromou <evan@prodromou.name>**20081230212202]
\ No newline at end of file diff --git a/_darcs/patches/20081230212202-84dde-d6439ad7061a56c9de0168ced3d95436ca20cb59.gz b/_darcs/patches/20081230212202-84dde-d6439ad7061a56c9de0168ced3d95436ca20cb59.gz Binary files differnew file mode 100644 index 000000000..2fbd4fe4f --- /dev/null +++ b/_darcs/patches/20081230212202-84dde-d6439ad7061a56c9de0168ced3d95436ca20cb59.gz diff --git a/_darcs/pristine/actions/twitapilaconica.php b/_darcs/pristine/actions/twitapilaconica.php index 17b7b0872..722423fae 100644 --- a/_darcs/pristine/actions/twitapilaconica.php +++ b/_darcs/pristine/actions/twitapilaconica.php @@ -115,6 +115,7 @@ class TwitapilaconicaAction extends TwitterapiAction switch ($apidata['content-type']) { case 'xml': $this->init_document('xml'); + common_element_start('config'); // XXX: check that all sections and settings are legal XML elements foreach ($keys as $section => $settings) { common_element_start($section); @@ -131,6 +132,7 @@ class TwitapilaconicaAction extends TwitterapiAction } common_element_end($section); } + common_element_end('config'); $this->end_document('xml'); break; case 'json': diff --git a/_darcs/tentative_pristine b/_darcs/tentative_pristine index 2a7c664f3..6a29f612c 100644 --- a/_darcs/tentative_pristine +++ b/_darcs/tentative_pristine @@ -1,11 +1,4 @@ -hunk ./actions/twitapilaconica.php 122 -- common_element($setting, null, common_config($section, $setting)); -+ $value = common_config($section, $setting); -+ if (is_array($value)) { -+ $value = implode(',', $value); -+ } else if ($value === false) { -+ $value = 'false'; -+ } else if ($value === true) { -+ $value = 'true'; -+ } -+ common_element($setting, null, $value); +hunk ./actions/twitapilaconica.php 118 ++ common_element_start('config'); +hunk ./actions/twitapilaconica.php 135 ++ common_element_end('config'); diff --git a/actions/twitapilaconica.php b/actions/twitapilaconica.php index 17b7b0872..722423fae 100644 --- a/actions/twitapilaconica.php +++ b/actions/twitapilaconica.php @@ -115,6 +115,7 @@ class TwitapilaconicaAction extends TwitterapiAction switch ($apidata['content-type']) { case 'xml': $this->init_document('xml'); + common_element_start('config'); // XXX: check that all sections and settings are legal XML elements foreach ($keys as $section => $settings) { common_element_start($section); @@ -131,6 +132,7 @@ class TwitapilaconicaAction extends TwitterapiAction } common_element_end($section); } + common_element_end('config'); $this->end_document('xml'); break; case 'json': |