Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Fix some small stuff #670

Merged
merged 3 commits into from

3 participants

@realityking
Collaborator

-A typo in JHtmlBehavior
-A couple of PHPMD warnings
-One use of JDatabase::isQuoted()

@joomla-jenkins
Collaborator

Unit testing complete. There were 0 failures and 0 errors from 1971 tests and 11142 assertions.
Checkstyle analysis reported 199 warnings and 0 errors.

@chdemko chdemko merged commit bd1660f into joomla:staging
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 23, 2011
  1. @realityking
  2. @realityking

    Fix a typo.

    realityking authored
  3. @realityking

    Fix more PHPMD warnings.

    realityking authored
This page is out of date. Refresh to see the latest.
View
2  libraries/joomla/database/database/sqlsrv.php
@@ -525,7 +525,7 @@ public function insertObject($table, &$object, $key = null)
continue;
}
$fields[] = $this->quoteName($k);
- $values[] = $this->isQuoted($k) ? $this->Quote($v) : (int) $v;
+ $values[] = $this->Quote($v);
}
// Set the query and execute the insert.
$this->setQuery(sprintf($statement, implode(',', $fields), implode(',', $values)));
View
4 libraries/joomla/document/feed/feed.php
@@ -197,10 +197,6 @@ public function render($cache = false, $params = array())
// Get the feed type
$type = JRequest::getCmd('type', 'rss');
- // set filename for rss feeds
- $file = strtolower(str_replace('.', '', $type));
- $file = $cache_path . '/' . $file . '_' . $option . '.xml';
-
// Instantiate feed renderer and set the mime encoding
$renderer = $this->loadRenderer(($type) ? $type : 'rss');
if (!is_a($renderer, 'JDocumentRenderer'))
View
2  libraries/joomla/html/html/behavior.php
@@ -783,7 +783,7 @@ public static function highlighter(array $terms, $start = 'highlighter-start', $
highlighter = new Joomla.Highlighter({
startElement: start,
endElement: end,
- className: '" . $className . "'
+ className: '" . $className . "',
onlyWords: false,
tag: '" . $tag . "'
}).highlight([\"" . implode('","', $terms) . "\"]);
Something went wrong with that request. Please try again.