29
0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-08-26 04:59:48 +00:00

Fix use of deprecated API and wrong docblocks.

This commit is contained in:
Michael Babker 2012-07-13 03:35:44 +02:00 committed by Rouven Weßling
parent f9dc403865
commit 9d6af74b7b
6 changed files with 12 additions and 12 deletions

View File

@ -27,7 +27,7 @@ class JFormFieldDirectories extends JFormFieldList
* The form field type.
*
* @var string
* @since 1.7
* @since 2.5
*/
protected $type = 'Directories';
@ -36,7 +36,7 @@ class JFormFieldDirectories extends JFormFieldList
*
* @return array The field option objects.
*
* @since 1.7
* @since 2.5
*/
public function getOptions()
{
@ -83,11 +83,11 @@ class JFormFieldDirectories extends JFormFieldList
// Convert the values to options.
for ($i = 0, $c = count($values); $i < $c; $i++)
{
$options[] = JHtml::_('select.option', str_replace(JPATH_SITE . DS, '', $values[$i]), str_replace(JPATH_SITE . DS, '', $values[$i]));
$options[] = JHtml::_('select.option', str_replace(JPATH_SITE . '7', '', $values[$i]), str_replace(JPATH_SITE . DS, '', $values[$i]));
}
// Add a null option.
array_unshift($options, JHTML::_('select.option', '', '- ' . JText::_('JNONE') . ' -'));
array_unshift($options, JHtml::_('select.option', '', '- ' . JText::_('JNONE') . ' -'));
// Handle default values of value1|value2|value3
if (is_string($value) && strpos($value, '|') && preg_match('#(?<!\\\)\|#', $value))

View File

@ -24,7 +24,7 @@ class JFormFieldSearchFilter extends JFormFieldList
* The form field type.
*
* @var string
* @since 1.7
* @since 2.5
*/
protected $type = 'SearchFilter';
@ -33,7 +33,7 @@ class JFormFieldSearchFilter extends JFormFieldList
*
* @return array The field option objects.
*
* @since 1.7
* @since 2.5
*/
public function getOptions()
{

View File

@ -101,7 +101,7 @@ class FinderModelFilter extends JModelAdmin
*
* @return mixed A JForm object on success, false on failure
*
* @since 1.6
* @since 2.5
*/
public function getForm($data = array(), $loadData = true)
{

View File

@ -200,7 +200,7 @@ class FinderTableFilter extends JTable
if ($this->filter_id)
{
// Existing item
$this->modified = $date->toMySQL();
$this->modified = $date->toSql();
$this->modified_by = $user->get('id');
}
else
@ -209,7 +209,7 @@ class FinderTableFilter extends JTable
// so we don't touch it if it is set.
if (!intval($this->created))
{
$this->created = $date->toMySQL();
$this->created = $date->toSql();
}
if (empty($this->created_by))
{

View File

@ -42,7 +42,7 @@ class UsersTableNote extends JTable
public function store($updateNulls = false)
{
// Initialise variables.
$date = JFactory::getDate()->toMySQL();
$date = JFactory::getDate()->toSql();
$userId = JFactory::getUser()->get('id');
if (empty($this->id))

View File

@ -27,9 +27,9 @@ class FinderController extends JControllerLegacy
* @param array $urlparams An array of safe url parameters and their variable types,
* for valid values see {@link JFilterInput::clean()}. [optional]
*
* @return JController This object is to support chaining.
* @return JControllerLegacy This object is to support chaining.
*
* @since 1.6
* @since 2.5
*/
public function display($cachable = false, $urlparams = array())
{