Changeset 3991
- Timestamp:
- 05/31/07 15:33:35 (2 years ago)
- Files:
-
- modules/branches/2.3 (modified) (1 prop)
- modules/branches/2.3/conferences/functions.inc.php (modified) (1 diff)
- modules/branches/2.3/conferences/module.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.3
- Property svnmerge-integrated changed from /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983 to /modules/branches/2.2:1-3588,3615-3635,3637-3638,3640,3674,3680,3686,3692,3702,3706,3710,3716,3758,3760,3762-3765,3767-3785,3787-3789,3801,3810,3828,3831,3839,3860,3866,3875,3877,3887,3899,3911,3913,3943,3982-3983,3990
modules/branches/2.3/conferences/functions.inc.php
r3648 r3991 16 16 if (isset($this->_meetmes) && is_array($this->_meetmes)) { 17 17 foreach (array_keys($this->_meetmes) as $meetme) { 18 $output .= 'conf => '.$meetme." |".$this->_meetmes[$meetme]."\n";18 $output .= 'conf => '.$meetme.",".$this->_meetmes[$meetme]."\n"; 19 19 } 20 20 } modules/branches/2.3/conferences/module.xml
r3656 r3991 2 2 <rawname>conferences</rawname> 3 3 <name>Conferences</name> 4 <version>1.2 </version>4 <version>1.2.1</version> 5 5 <type>setup</type> 6 6 <category>Internal Options & Configuration</category> 7 7 <description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description> 8 8 <changelog> 9 *1.2.1* changed syntax error in meetme_additional.conf form '|' to ',' separator 9 10 *1.2* Fixed raising asterisk error on empty dialstatus #1708 10 11 *1.1.2* Add he_IL translation
