Skip to content
Snippets Groups Projects

Resolve #3435460 "D11 ready"

8 files
+ 149
34
Compare changes
  • Side-by-side
  • Inline
Files
8
@@ -63,7 +63,7 @@ class ExtraResult extends AreaPluginBase {
* {@inheritdoc}
*/
public function query() {
if (strpos($this->options['content'], '@total') || strpos($this->options['content'], '@more')) {
if (strpos($this->options['content'], '@total') || strpos($this->options['content'], '@more')) {
$this->view->get_total_rows = TRUE;
}
}
@@ -81,9 +81,9 @@ class ExtraResult extends AreaPluginBase {
// Calculate the page totals.
$current_page = (int) $this->view->getCurrentPage() + 1;
$per_page = (int) $this->view->getItemsPerPage();
// @TODO: Maybe use a possible is views empty functionality.
// @todo Maybe use a possible is views empty functionality.
// Not every view has total_rows set, use view->result instead.
$total = isset($this->view->total_rows) ? $this->view->total_rows : count($this->view->result);
$total = $this->view->total_rows ?? count($this->view->result);
$label = Html::escape($this->view->storage->label());
if ($per_page === 0) {
$page_count = 1;
@@ -114,14 +114,14 @@ class ExtraResult extends AreaPluginBase {
// Send the output.
if (!empty($total)) {
$format_list = explode(PHP_EOL, $format);
foreach ($format_list as $value){
if(strpos($value, '@more')){
//condition to hide more count when its 0.
if($replacements['@more'] > 0){
foreach ($format_list as $value) {
if (strpos($value, '@more')) {
// Condition to hide more count when its 0.
if ($replacements['@more'] > 0) {
$output .= Xss::filterAdmin(str_replace(array_keys($replacements), array_values($replacements), $value));
}
}
else{
else {
$output .= Xss::filterAdmin(str_replace(array_keys($replacements), array_values($replacements), $value));
}
}
Loading