From 83cad7273ea309d8b22ebd6cfed428bc3cb075e0 Mon Sep 17 00:00:00 2001
From: Matthieu Leproux <leproux.matthieu@gmail.com>
Date: Tue, 7 Dec 2021 15:18:35 +0100
Subject: [PATCH 1/2] Compatibility Piwigo 12

---
 12_0_x.pattern.php | 108 +++++++++++++++++++++++++++++++++++++++++++++
 themeconf.inc.php  |   2 +-
 2 files changed, 109 insertions(+), 1 deletion(-)
 create mode 100644 12_0_x.pattern.php

diff --git a/12_0_x.pattern.php b/12_0_x.pattern.php
new file mode 100644
index 0000000..123c1cf
--- /dev/null
+++ b/12_0_x.pattern.php
@@ -0,0 +1,108 @@
+<?php
+$pattern['Pure_default_prefilter_index']['S']['table_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';
+$pattern['Pure_default_prefilter_index']['R']['table_content_begin']='<div id="content" class="content{if isset($MENUBAR)} contentWithMenu{/if}">
+  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
+    <tr>
+      <td id="section_up_left">&nbsp;</td>
+      <td id="section_up">&nbsp;</td>
+      <td id="section_up_right">&nbsp;</td>
+    </tr>
+    <tr>
+      <td id="section_left">&nbsp;</td>
+      <td id="section_in">
+';
+$pattern['Pure_default_prefilter_index']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_INDEX_CONTENT_END\)\}\{\$PLUGIN_INDEX_CONTENT_END\}\{/if\}#';
+$pattern['Pure_default_prefilter_index']['R']['table_content_end']='{if !empty($PLUGIN_INDEX_CONTENT_END)}{$PLUGIN_INDEX_CONTENT_END}{/if}
+      </td>
+	  <td id="section_right">&nbsp;</td>
+    </tr>
+    <tr>
+      <td id="section_bottom_left">&nbsp;</td>
+      <td id="section_bottom" >&nbsp;</td>
+      <td id="section_bottom_right" >&nbsp;</td>
+    </tr>
+  </table>
+';
+
+$pattern['Pure_default_prefilter_picture']['S']['table_content_begin']='#<div id="content"\{if isset\(\$MENUBAR\)\} class="contentWithMenu"\{/if\}>#';
+$pattern['Pure_default_prefilter_picture']['R']['table_content_begin']='<div id="content" {if isset($MENUBAR)} class="contentWithMenu"{/if}>
+  <table id="table_content" border="0" cellspacing="0" cellpadding="0">
+    <tr>
+      <td id="section_up_left">&nbsp;</td>
+      <td id="section_up">&nbsp;</td>
+      <td id="section_up_right">&nbsp;</td>
+    </tr>
+    <tr>
+      <td id="section_left">&nbsp;</td>
+      <td id="section_in">
+';
+$pattern['Pure_default_prefilter_picture']['S']['table_content_end']='#\{if \!empty\(\$PLUGIN_PICTURE_AFTER\)\}\{\$PLUGIN_PICTURE_AFTER\}\{/if\}#';  
+$pattern['Pure_default_prefilter_picture']['R']['table_content_end']='{if !empty($PLUGIN_PICTURE_AFTER)}{$PLUGIN_PICTURE_AFTER}{/if}
+      </td>
+	  <td id="section_right">&nbsp;</td>
+    </tr>
+    <tr>
+      <td id="section_bottom_left">&nbsp;</td>
+      <td id="section_bottom" >&nbsp;</td>
+      <td id="section_bottom_right" >&nbsp;</td>
+    </tr>
+  </table>
+';
+/**************************** identification.tpl *****************************************************************/
+$pattern['Pure_default_prefilter_identification']['S']['autre_content_begin']='#<form action="\{\$F_LOGIN_ACTION\}" method="post" name="login_form" class="properties">#';  
+$pattern['Pure_default_prefilter_identification']['R']['autre_content_begin']= '<div id="autre_content">
+<form action="{$F_LOGIN_ACTION}" method="post" name="login_form" class="properties">
+';
+$pattern['Pure_default_prefilter_identification']['S']['autre_content_end']='#</div>[\s]*<\!-- content -->#';  
+$pattern['Pure_default_prefilter_identification']['R']['autre_content_end']='</div>
+	</div> <!-- content -->';
+/**************************** nbm.tpl *****************************************************************/
+$pattern['Pure_default_prefilter_nbm']['S']['autre_content_begin']='#\{if not empty(\$errors)\}#';  
+$pattern['Pure_default_prefilter_nbm']['R']['autre_content_begin']= '<div id="autre_content">
+{if not empty($errors)}
+';
+$pattern['Pure_default_prefilter_nbm']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
+$pattern['Pure_default_prefilter_nbm']['R']['autre_content_end']='<{/if}
+	</div>
+	</div> <!-- content -->';
+/**************************** notification.tpl *****************************************************************/
+$pattern['Pure_default_prefilter_notification']['S']['autre_content_begin']='#<div id="content" class="content\{if isset\(\$MENUBAR\)\} contentWithMenu\{/if\}">#';  
+$pattern['Pure_default_prefilter_notification']['R']['autre_content_begin']= '<div id="autre_content" {if isset($MENUBAR)}class="contentWithMenu{/if}"><div id="content" class="content">';
+$pattern['Pure_default_prefilter_notification']['S']['autre_content_end']='#</dt>[\s]*</dl>#';  
+$pattern['Pure_default_prefilter_notification']['R']['autre_content_end']='</dt>
+	</dl>
+</div>';
+/**************************** password.tpl *****************************************************************/
+$pattern['Pure_default_prefilter_password']['S']['autre_content_begin']='#<form action=#';  
+$pattern['Pure_default_prefilter_password']['R']['autre_content_begin']= '<div id="autre_content">
+<form action=';
+$pattern['Pure_default_prefilter_password']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
+$pattern['Pure_default_prefilter_password']['R']['autre_content_end']='</div>
+	</div> <!-- content -->';
+/**************************** tags.tpl *****************************************************************/
+$pattern['Pure_default_prefilter_tags']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
+$pattern['Pure_default_prefilter_tags']['R']['autre_content_begin']= '</h2>
+  </div>
+<div id="autre_content">';
+$pattern['Pure_default_prefilter_tags']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
+$pattern['Pure_default_prefilter_tags']['R']['autre_content_end']='</div>
+	</div> <!-- content -->';
+/**************************** about.tpl *****************************************************************/
+$pattern['Pure_default_prefilter_about']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
+$pattern['Pure_default_prefilter_about']['R']['autre_content_begin']= '</h2>
+  </div>
+<div id="autre_content">';
+$pattern['Pure_default_prefilter_about']['S']['autre_content_end']='#\{/if\}[\s]*</div>#';  
+$pattern['Pure_default_prefilter_about']['R']['autre_content_end']='{/if}
+  </div>
+  </div>';
+/**************************** popuphelp.tpl *****************************************************************/
+$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_begin']='#</h2>[\s]*</div>#';  
+$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_begin']= '</h2>
+  </div>
+<div id="autre_content">';
+$pattern['Pure_default_prefilter_popuphelp']['S']['autre_content_end']='#</div>[\s]*<!-- content -->#';  
+$pattern['Pure_default_prefilter_popuphelp']['R']['autre_content_end']='</div>
+	</div> <!-- content -->';
+
+?>
diff --git a/themeconf.inc.php b/themeconf.inc.php
index 2bb1bf1..4310462 100644
--- a/themeconf.inc.php
+++ b/themeconf.inc.php
@@ -131,7 +131,7 @@ function Pure_default_index()
   global $template;
   $template->set_prefilter('index', 'Pure_default_prefilter_index');
 }
-function Pure_default_prefilter_index($content, &$smarty)
+function Pure_default_prefilter_index($content)
 {
   global $pattern;
   $r=$pattern['Pure_default_prefilter_index']['R'];

From bab4c06fcc2dfec0c876627ef6641a75cbb0fb84 Mon Sep 17 00:00:00 2001
From: Matthieu Leproux <leproux.matthieu@gmail.com>
Date: Wed, 8 Dec 2021 11:12:11 +0100
Subject: [PATCH 2/2] Compatibility with piwigo 12

---
 themeconf.inc.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/themeconf.inc.php b/themeconf.inc.php
index 4310462..a4ab324 100644
--- a/themeconf.inc.php
+++ b/themeconf.inc.php
@@ -150,7 +150,7 @@ function Pure_default_picture()
   global $template;
   $template->set_prefilter('picture', 'Pure_default_prefilter_picture');
 }
-function Pure_default_prefilter_picture($content, &$smarty)
+function Pure_default_prefilter_picture($content)
 {
   global $pattern;
   $r=$pattern['Pure_default_prefilter_picture']['R'];
@@ -162,7 +162,7 @@ function Pure_default_prefilter_picture($content, &$smarty)
   return $content;
 }
 /**************************** identification.tpl *****************************************************************/
-function Pure_default_prefilter_identification($content, &$smarty)
+function Pure_default_prefilter_identification($content)
 {
   global $pattern;
   $r=$pattern['Pure_default_prefilter_identification']['R'];
@@ -174,7 +174,7 @@ function Pure_default_prefilter_identification($content, &$smarty)
   return $content;
 }
 /**************************** nbm.tpl *****************************************************************/
-function Pure_default_prefilter_nbm($content, &$smarty)
+function Pure_default_prefilter_nbm($content)
 {
   global $pattern;
   $r=$pattern['Pure_default_prefilter_nbm']['R'];
@@ -186,7 +186,7 @@ function Pure_default_prefilter_nbm($content, &$smarty)
   return $content;
 }
 /**************************** notification.tpl *****************************************************************/
-function Pure_default_prefilter_notification($content, &$smarty)
+function Pure_default_prefilter_notification($content)
 {
   global $pattern;
   $r=$pattern['Pure_default_prefilter_notification']['R'];
@@ -198,7 +198,7 @@ function Pure_default_prefilter_notification($content, &$smarty)
   return $content;
 }
 /**************************** password.tpl *****************************************************************/
-function Pure_default_prefilter_password($content, &$smarty)
+function Pure_default_prefilter_password($content)
 {
   global $pattern;
   $r=$pattern['Pure_default_prefilter_password']['R'];
@@ -210,7 +210,7 @@ function Pure_default_prefilter_password($content, &$smarty)
   return $content;
 }
 /**************************** tags.tpl *****************************************************************/
-function Pure_default_prefilter_tags($content, &$smarty)
+function Pure_default_prefilter_tags($content)
 {
   global $pattern;
   $r=$pattern['Pure_default_prefilter_tags']['R'];
@@ -222,7 +222,7 @@ function Pure_default_prefilter_tags($content, &$smarty)
   return $content;
 }
 /**************************** about.tpl *****************************************************************/
-function Pure_default_prefilter_about($content, &$smarty)
+function Pure_default_prefilter_about($content)
 {
   global $pattern;
   $r=$pattern['Pure_default_prefilter_about']['R'];
@@ -234,7 +234,7 @@ function Pure_default_prefilter_about($content, &$smarty)
   return $content;
 }
 /**************************** popuphelp.tpl *****************************************************************/
-function Pure_default_prefilter_popuphelp($content, &$smarty)
+function Pure_default_prefilter_popuphelp($content)
 {
   global $pattern;
   $r=$pattern['Pure_default_prefilter_popuphelp']['R'];