| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_QP_iCalendar.php |
| — | — | @@ -17,10 +17,16 @@ |
| 18 | 18 | |
| 19 | 19 | protected function readParameters($params,$outputmode) { |
| 20 | 20 | SMWResultPrinter::readParameters($params,$outputmode); |
| 21 | | - if (array_key_exists('icalendartitle', $this->m_params)) { |
| | 21 | + if (array_key_exists('title', $this->m_params)) { |
| | 22 | + $this->m_title = trim($this->m_params['title']); |
| | 23 | + // for backward compatibility |
| | 24 | + } elseif (array_key_exists('icalendartitle', $this->m_params)) { |
| 22 | 25 | $this->m_title = trim($this->m_params['icalendartitle']); |
| 23 | 26 | } |
| 24 | | - if (array_key_exists('icalendardescription', $this->m_params)) { |
| | 27 | + if (array_key_exists('description', $this->m_params)) { |
| | 28 | + $this->m_description = trim($this->m_params['description']); |
| | 29 | + // for backward compatibility |
| | 30 | + } elseif (array_key_exists('icalendardescription', $this->m_params)) { |
| 25 | 31 | $this->m_description = trim($this->m_params['icalendardescription']); |
| 26 | 32 | } |
| 27 | 33 | } |
| — | — | @@ -113,10 +119,10 @@ |
| 114 | 120 | $link = $res->getQueryLink($label); |
| 115 | 121 | $link->setParameter('icalendar','format'); |
| 116 | 122 | if ($this->m_title !== '') { |
| 117 | | - $link->setParameter($this->m_title,'icalendartitle'); |
| | 123 | + $link->setParameter($this->m_title,'title'); |
| 118 | 124 | } |
| 119 | 125 | if ($this->m_description !== '') { |
| 120 | | - $link->setParameter($this->m_description,'icalendardescription'); |
| | 126 | + $link->setParameter($this->m_description,'description'); |
| 121 | 127 | } |
| 122 | 128 | if (array_key_exists('limit', $this->m_params)) { |
| 123 | 129 | $link->setParameter($this->m_params['limit'],'limit'); |
| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_QP_RSSlink.php |
| — | — | @@ -18,10 +18,16 @@ |
| 19 | 19 | |
| 20 | 20 | protected function readParameters($params,$outputmode) { |
| 21 | 21 | SMWResultPrinter::readParameters($params,$outputmode); |
| 22 | | - if (array_key_exists('rsstitle', $this->m_params)) { |
| | 22 | + if (array_key_exists('title', $this->m_params)) { |
| | 23 | + $this->m_title = trim($this->m_params['title']); |
| | 24 | + // for backward compatibiliy |
| | 25 | + } elseif (array_key_exists('rsstitle', $this->m_params)) { |
| 23 | 26 | $this->m_title = trim($this->m_params['rsstitle']); |
| 24 | 27 | } |
| 25 | | - if (array_key_exists('rssdescription', $this->m_params)) { |
| | 28 | + if (array_key_exists('description', $this->m_params)) { |
| | 29 | + $this->m_description = trim($this->m_params['description']); |
| | 30 | + // for backward compatibiliy |
| | 31 | + } elseif (array_key_exists('rssdescription', $this->m_params)) { |
| 26 | 32 | $this->m_description = trim($this->m_params['rssdescription']); |
| 27 | 33 | } |
| 28 | 34 | } |
| — | — | @@ -104,10 +110,10 @@ |
| 105 | 111 | $link = $res->getQueryLink($label); |
| 106 | 112 | $link->setParameter('rss','format'); |
| 107 | 113 | if ($this->m_title !== '') { |
| 108 | | - $link->setParameter($this->m_title,'rsstitle'); |
| | 114 | + $link->setParameter($this->m_title,'title'); |
| 109 | 115 | } |
| 110 | 116 | if ($this->m_description !== '') { |
| 111 | | - $link->setParameter($this->m_description,'rssdescription'); |
| | 117 | + $link->setParameter($this->m_description,'description'); |
| 112 | 118 | } |
| 113 | 119 | if (array_key_exists('limit', $this->m_params)) { |
| 114 | 120 | $link->setParameter($this->m_params['limit'],'limit'); |