From 7fbb9d77ba427a80333dc8e4b9a120706ae0601c Mon Sep 17 00:00:00 2001
From: Dmitriy Antipov <aston_bonny@mail.ru>
Date: Fri, 14 Jun 2019 23:26:32 +0300
Subject: [PATCH 1/2] add pdotools-fenom support

add pdotools-fenom support
---
 .../gallery/elements/snippets/snippet.gallery.php    | 10 +++++++---
 .../elements/snippets/snippet.galleryalbums.php      | 12 ++++++++++--
 .../elements/snippets/snippet.galleryitem.php        |  6 +++++-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/core/components/gallery/elements/snippets/snippet.gallery.php b/core/components/gallery/elements/snippets/snippet.gallery.php
index 9e84ebf..b1563a8 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,8 @@
         }
     }
 
-    $output[] = $gallery->getChunk($thumbTpl,$itemArray);
+    //$output[] = $gallery->getChunk($thumbTpl,$itemArray);
+    $output[] = $parser->getChunk($thumbTpl, $itemArray);
 
     $idx++;
 }
@@ -162,7 +166,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 +203,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..b9b8e8c 100644
--- a/core/components/gallery/elements/snippets/snippet.galleryalbums.php
+++ b/core/components/gallery/elements/snippets/snippet.galleryalbums.php
@@ -39,6 +39,9 @@
 $albumCoverSortDir = $modx->getOption('albumCoverSortDir',$scriptProperties,'ASC');
 $showName = $modx->getOption('showName',$scriptProperties,true);
 
+$offset = isset($offset) ? (integer) $offset : 0;
+$scriptProperties['start'] = $offset;
+
 $totalProperties = $scriptProperties;
 $totalProperties['limit'] = '0';
 $totalProperties['start'] = '0';
@@ -69,6 +72,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 +118,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 +145,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

From 07cdf514a65bdbbfc0aa50d8b89c12a48837a3b3 Mon Sep 17 00:00:00 2001
From: Dmitriy Antipov <aston_bonny@mail.ru>
Date: Fri, 14 Jun 2019 23:30:33 +0300
Subject: [PATCH 2/2] fix

---
 core/components/gallery/elements/snippets/snippet.gallery.php  | 1 -
 .../gallery/elements/snippets/snippet.galleryalbums.php        | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/core/components/gallery/elements/snippets/snippet.gallery.php b/core/components/gallery/elements/snippets/snippet.gallery.php
index b1563a8..a1f0650 100644
--- a/core/components/gallery/elements/snippets/snippet.gallery.php
+++ b/core/components/gallery/elements/snippets/snippet.gallery.php
@@ -156,7 +156,6 @@
         }
     }
 
-    //$output[] = $gallery->getChunk($thumbTpl,$itemArray);
     $output[] = $parser->getChunk($thumbTpl, $itemArray);
 
     $idx++;
diff --git a/core/components/gallery/elements/snippets/snippet.galleryalbums.php b/core/components/gallery/elements/snippets/snippet.galleryalbums.php
index b9b8e8c..10a23a2 100644
--- a/core/components/gallery/elements/snippets/snippet.galleryalbums.php
+++ b/core/components/gallery/elements/snippets/snippet.galleryalbums.php
@@ -39,9 +39,6 @@
 $albumCoverSortDir = $modx->getOption('albumCoverSortDir',$scriptProperties,'ASC');
 $showName = $modx->getOption('showName',$scriptProperties,true);
 
-$offset = isset($offset) ? (integer) $offset : 0;
-$scriptProperties['start'] = $offset;
-
 $totalProperties = $scriptProperties;
 $totalProperties['limit'] = '0';
 $totalProperties['start'] = '0';