diff --git a/core/components/gallery/elements/snippets/snippet.gallery.php b/core/components/gallery/elements/snippets/snippet.gallery.php index 9e84ebf..a1f0650 100644 --- a/core/components/gallery/elements/snippets/snippet.gallery.php +++ b/core/components/gallery/elements/snippets/snippet.gallery.php @@ -116,6 +116,9 @@ } ksort($nthTpls); +if (class_exists('pdoTools') && $pdo = $modx->getService('pdoTools')) $parser = $pdo; +else $parser = $gallery; + foreach ($data['items'] as $item) { $itemArray = $item->toArray(); $itemArray['idx'] = $idx; @@ -153,7 +156,7 @@ } } - $output[] = $gallery->getChunk($thumbTpl,$itemArray); + $output[] = $parser->getChunk($thumbTpl, $itemArray); $idx++; } @@ -162,7 +165,7 @@ /* if set, place in a container tpl */ $containerTpl = $modx->getOption('containerTpl',$scriptProperties,false); if (!empty($containerTpl)) { - $ct = $gallery->getChunk($containerTpl,array( + $ct = $parser->getChunk($containerTpl,array( 'thumbnails' => $output, 'album_name' => $data['album']['name'], 'album_description' => $data['album']['description'], @@ -199,4 +202,4 @@ )); return $output; } -return ''; +return ''; \ No newline at end of file diff --git a/core/components/gallery/elements/snippets/snippet.galleryalbums.php b/core/components/gallery/elements/snippets/snippet.galleryalbums.php index 267dc18..10a23a2 100644 --- a/core/components/gallery/elements/snippets/snippet.galleryalbums.php +++ b/core/components/gallery/elements/snippets/snippet.galleryalbums.php @@ -69,6 +69,11 @@ 'q' => (int)$modx->getOption('thumbQuality',$scriptProperties,90), ),$thumbProperties); +//$pdo = $modx->getService('pdoTools'); // add +if (class_exists('pdoTools') && $pdo = $modx->getService('pdoTools')) $parser = $pdo; +else $parser = $gallery; +// + /* iterate */ $output = array(); $idx = 0; @@ -110,7 +115,7 @@ $albumArray['idx'] = $idx; $albumArray['showName'] = $showName; $albumArray['albumRequestVar'] = $albumRequestVar; - $output[] = $gallery->getChunk($rowTpl,$albumArray); + $output[] = $parser->getChunk($rowTpl, $albumArray); $idx++; } if (!isset($nav['current'])) { @@ -137,4 +142,4 @@ $modx->setPlaceholder($toPlaceholder,$output); return ''; } -return $output; +return $output; \ No newline at end of file diff --git a/core/components/gallery/elements/snippets/snippet.galleryitem.php b/core/components/gallery/elements/snippets/snippet.galleryitem.php index b50dfe0..e00338b 100644 --- a/core/components/gallery/elements/snippets/snippet.galleryitem.php +++ b/core/components/gallery/elements/snippets/snippet.galleryitem.php @@ -124,6 +124,10 @@ return ''; } +if (class_exists('pdoTools') && $pdo = $modx->getService('pdoTools')) $parser = $pdo; +else $parser = $gallery; + if (empty($tpl)) return ''; -$output .= $gallery->getChunk($tpl,$itemArray); +$output .= $parser->getChunk($tpl, $itemArray); + return $output; \ No newline at end of file