commiting things to merge

This commit is contained in:
naomiaro 2010-09-07 16:20:02 -04:00
parent aa9528b9fd
commit f0af40ffea
2 changed files with 4 additions and 2 deletions

View File

@ -56,6 +56,7 @@ define('UI_CALENDAR_SESSNAME', 'CALENDAR');
// Metadata Keys // Metadata Keys
define('UI_MDATA_KEY_TITLE', 'dc:title'); define('UI_MDATA_KEY_TITLE', 'dc:title');
define('UI_MDATA_KEY_CREATOR', 'dc:creator'); define('UI_MDATA_KEY_CREATOR', 'dc:creator');
define('UI_MDATA_KEY_SOURCE', 'dc:source');
define('UI_MDATA_KEY_DURATION', 'dcterms:extent'); define('UI_MDATA_KEY_DURATION', 'dcterms:extent');
define('UI_MDATA_KEY_URL', 'ls:url'); define('UI_MDATA_KEY_URL', 'ls:url');
define('UI_MDATA_KEY_FORMAT', 'dc:format'); define('UI_MDATA_KEY_FORMAT', 'dc:format');

View File

@ -64,7 +64,8 @@ if ($verbose) {
echo "Host: {$url['host']}, path: {$url['path']}\n"; echo "Host: {$url['host']}, path: {$url['path']}\n";
echo "Method: $method\n"; echo "Method: $method\n";
echo "Parameters:\n"; echo "Parameters:\n";
var_dump($pars); //var_dump($pars);
var_dump($options);
} }
$infos = array( $infos = array(
@ -283,7 +284,7 @@ switch ($method) {
} // switch } // switch
$fullmethod = $infos[$method]['m']; $fullmethod = $infos[$method]['m'];
$msg = new XML_RPC_Message($fullmethod, array(XML_RPC_encode($parr))); $msg = new XML_RPC_Message($fullmethod, array(XML_RPC_encode($options)));
if ($verbose) { if ($verbose) {
echo "parr:\n"; echo "parr:\n";