Skip to content
This repository has been archived by the owner on Nov 26, 2017. It is now read-only.

Some small fixes to recent commits. #1096

Merged
merged 2 commits into from
Apr 1, 2012
Merged

Some small fixes to recent commits. #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea99617
Some small fixes to recent commits.
realityking Apr 1, 2012
c2d2999
Remove a useless todo.
realityking Apr 1, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion libraries/joomla/mail/mail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ public function addBCC($bcc, $name = '')
* @return JMail Returns this object for chaining.
*
* @since 11.1
* @throws InvalidArgumentException
*/
public function addAttachment($attachment, $name = '', $encoding = 'base64', $type = 'application/octet-stream')
{
Expand All @@ -281,7 +282,7 @@ public function addAttachment($attachment, $name = '', $encoding = 'base64', $ty
{
if (!empty($name) && count($attachment) != count($name))
{
throw new RuntimeException("The number of attachments must be equal with the number of name");
throw new InvalidArgumentException("The number of attachments must be equal with the number of name");
}

foreach ($attachment as $key => $file)
Expand Down
1 change: 0 additions & 1 deletion libraries/joomla/table/table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,6 @@ public function hit($pk = null)
*
* @link http://docs.joomla.org/JTable/isCheckedOut
* @since 11.1
* @todo This either needs to be static or not.
*/
public function isCheckedOut($with = 0, $against = null)
{
Expand Down
8 changes: 4 additions & 4 deletions libraries/joomla/user/helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ abstract class JUserHelper
* @param integer $userId The id of the user.
* @param integer $groupId The id of the group.
*
* @return mixed Boolean true on success
* @return boolean True on success
*
* @since 11.1
* @throws RuntimeException
Expand Down Expand Up @@ -81,7 +81,7 @@ public static function addUserToGroup($userId, $groupId)
*
* @param integer $userId The id of the user.
*
* @return mixed Array on success
* @return array List of groups
*
* @since 11.1
*/
Expand All @@ -99,7 +99,7 @@ public static function getUserGroups($userId)
* @param integer $userId The id of the user.
* @param integer $groupId The id of the group.
*
* @return mixed Boolean true on success
* @return boolean True on success
*
* @since 11.1
*/
Expand Down Expand Up @@ -139,7 +139,7 @@ public static function removeUserFromGroup($userId, $groupId)
* @param integer $userId The id of the user.
* @param array $groups An array of group ids to put the user in.
*
* @return mixed Boolean true on success
* @return boolean True on success
*
* @since 11.1
*/
Expand Down