Skip to content

Commit 47969a6

Browse files
philwarehamphilwareham
committed
Remove etc_cache
Not needed on latest server spec. Fixes #275.
1 parent 66adb76 commit 47969a6

File tree

7 files changed

+42
-60
lines changed

7 files changed

+42
-60
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ For example:
102102

103103
All plugins we use are installed via Composer:
104104

105-
* [`etc_cache`](https://github.com/etc-plugins/etc_cache) ✓ Composer
106105
* [`etc_pagination`](https://github.com/etc-plugins/etc_pagination) ✓ Composer
107106
* [`pat_if_amp`](https://github.com/cara-tm/pat_if_amp) ✓ Composer
108107
* [`rah_comment_spam`](https://github.com/gocom/rah_comment_spam) ✓ Composer

‎composer.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"textpattern/installer": "1.0.10",
99
"bloke/smd_thumbnail": "0.4.0-beta",
1010
"cara-tm/pat_if_amp": "0.3.7",
11-
"etc-plugins/etc_cache": "0.2.8",
1211
"etc-plugins/etc_pagination": "0.5.0",
1312
"rah/rah_comment_spam": "0.9.0"
1413
}

‎src/templates/forms/misc/ads_webinformer.txp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<txp:etc_cache id="webinformer" time="-300">
21
<h3>Featured at:</h3>
32
<txp:php>
43
if (!gps('txpreview')) {
@@ -68,4 +67,3 @@ EOHTML;
6867
}
6968
}
7069
</txp:php>
71-
</txp:etc_cache>

‎src/templates/forms/misc/language_table.txp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<txp:etc_cache id="crowdin" time="-3600">
21
<txp:php>
32
$key = parse('<txp:yield name="api-key" />');
43

@@ -48,4 +47,3 @@ echo <<<EOHTML
4847
</div>
4948
EOHTML;
5049
</txp:php>
51-
</txp:etc_cache>

‎src/templates/pages/default.txp‎

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,12 @@
5959
<h1 class="cta"><span>The small content management system that can handle big ideas</span></h1>
6060
<hr>
6161
<p class="cta-buttons">
62-
<txp:etc_cache id="homepage-downloads">
63-
<a class="button button-primary button-large" href="<txp:site_url />start"><span class="ui-button-icon ui-icon ui-extra-icon-download"></span> Download Textpattern <span class="txp-version"><txp:file_download_list category="current-release-zip" limit="1" sort="created desc"><txp:file_download_name title /></txp:file_download_list></span></a>
64-
</txp:etc_cache>
62+
<a class="button button-primary button-large" href="<txp:site_url />start"><span class="ui-button-icon ui-icon ui-extra-icon-download"></span> Download Textpattern <span class="txp-version"><txp:file_download_list category="current-release-zip" limit="1" sort="created desc"><txp:file_download_name title /></txp:file_download_list></span></a>
6563
<a class="button" href="<txp:site_url />demo">Try a demo</a>
6664
</p>
6765
<p>
6866
<a class="button" rel="external" href="https://github.com/textpattern/textpattern/" title="Stars on GitHub"><span class="ui-icon ui-extra-icon-github">GitHub</span> <strong>Stars</strong></a>
69-
<txp:etc_cache id="github-stars" time="-3600">
70-
<txp:php>
67+
<txp:php>
7168
global $variable;
7269

7370
$query = <<<'GRAPHQL'
@@ -108,8 +105,7 @@ if (!($json = json_decode($response))) {
108105
}
109106

110107
echo '<a class="count-bubble" rel="external" href="https://github.com/textpattern/textpattern/stargazers" title="Stargazers on GitHub">'.intval($json->data->repository->stargazers->totalCount).'</a>';
111-
</txp:php>
112-
</txp:etc_cache>
108+
</txp:php>
113109
</p>
114110
</div>
115111
</div>
@@ -164,29 +160,27 @@ echo '<a class="count-bubble" rel="external" href="https://github.com/textpatter
164160
<div>
165161
<p>Our users continue to amaze us with their wonderful creations! Feast your eyes on some of the awesome websites powered by Textpattern CMS in our <a href="<txp:site_url />showcase/">site showcase section</a>.</p>
166162
</div>
167-
<txp:etc_cache id="homepage-showcases">
168-
<div class="showcases showcase-home-c">
169-
<txp:images category="showcase-home-c" limit="1" sort="date desc">
170-
<txp:smd_thumbnail type="showcase-teaser-450w300h">
171-
<img loading="lazy" class="img--showcase" width="450" height="300" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
172-
</txp:smd_thumbnail>
173-
</txp:images>
174-
</div>
175-
<div class="showcases showcase-home-l">
176-
<txp:images category="showcase-home-l" limit="1" sort="date desc">
177-
<txp:smd_thumbnail type="showcase-teaser-318w212h">
178-
<img loading="lazy" class="img--showcase" width="318" height="212" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
179-
</txp:smd_thumbnail>
180-
</txp:images>
181-
</div>
182-
<div class="showcases showcase-home-r">
183-
<txp:images category="showcase-home-r" limit="1" sort="date desc">
184-
<txp:smd_thumbnail type="showcase-teaser-318w212h">
185-
<img loading="lazy" class="img--showcase" width="318" height="212" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
186-
</txp:smd_thumbnail>
187-
</txp:images>
188-
</div>
189-
</txp:etc_cache>
163+
<div class="showcases showcase-home-c">
164+
<txp:images category="showcase-home-c" limit="1" sort="date desc">
165+
<txp:smd_thumbnail type="showcase-teaser-450w300h">
166+
<img loading="lazy" class="img--showcase" width="450" height="300" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
167+
</txp:smd_thumbnail>
168+
</txp:images>
169+
</div>
170+
<div class="showcases showcase-home-l">
171+
<txp:images category="showcase-home-l" limit="1" sort="date desc">
172+
<txp:smd_thumbnail type="showcase-teaser-318w212h">
173+
<img loading="lazy" class="img--showcase" width="318" height="212" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
174+
</txp:smd_thumbnail>
175+
</txp:images>
176+
</div>
177+
<div class="showcases showcase-home-r">
178+
<txp:images category="showcase-home-r" limit="1" sort="date desc">
179+
<txp:smd_thumbnail type="showcase-teaser-318w212h">
180+
<img loading="lazy" class="img--showcase" width="318" height="212" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
181+
</txp:smd_thumbnail>
182+
</txp:images>
183+
</div>
190184
</section>
191185
</div>
192186
<div class="wrapper-inner zebra">
@@ -212,15 +206,12 @@ echo '<a class="count-bubble" rel="external" href="https://github.com/textpatter
212206
<section class="layout-3col-2span" itemscope itemtype="https://schema.org/Blog">
213207
<h3>Latest from <a href="<txp:site_url />weblog">the blog</a>…</h3>
214208
<p><img loading="lazy" class="prefers-color-scheme" width="756" height="160" alt="The Textpattern blog" src="/assets/img/com/index-blog-header.png" data-src-light="/assets/img/com/index-blog-header.png" data-src-dark="/assets/img/com/dark-index-blog-header.png" srcset="/assets/img/com/index-blog-header@2x.png 2x" data-srcset-light="/assets/img/com/index-blog-header@2x.png 2x" data-srcset-dark="/assets/img/com/dark-index-blog-header@2x.png 2x"></p>
215-
<txp:etc_cache id="homepage-blogs">
216-
<txp:article form="article_listing_blog" limit="2" />
217-
</txp:etc_cache>
209+
<txp:article form="article_listing_blog" limit="2" />
218210
</section>
219211
<div class="layout-3col">
220212
<h3>Latest from <a href="https://forum.textpattern.com/">the forum</a>…</h3>
221213
<ul class="list--no-bullets ellipsis">
222-
<txp:etc_cache id="forum-feed" time="-900">
223-
<txp:php>
214+
<txp:php>
224215
$curl = curl_init();
225216

226217
curl_setopt_array($curl, [
@@ -244,9 +235,8 @@ if (!($json = json_decode($response))) {
244235
foreach ($json->topic as $topic) {
245236
echo '<li><a href="'.htmlspecialchars($topic->link).'">'.htmlspecialchars($topic->title).'</a> <small class="block">by '.htmlspecialchars($topic->author->name).' on <time datetime="'.htmlspecialchars($topic->postedutc).'">'.htmlspecialchars($topic->posted).'</time></small></li>';
246237
}
247-
</txp:php>
248-
<txp:linklist category="paid-links-content" break="li"><a rel="external" referrerpolicy="origin" href="<txp:link_url />"><txp:link_name /></a> <small>(Ad)</small></txp:linklist>
249-
</txp:etc_cache>
238+
</txp:php>
239+
<txp:linklist category="paid-links-content" break="li"><a rel="external" referrerpolicy="origin" href="<txp:link_url />"><txp:link_name /></a> <small>(Ad)</small></txp:linklist>
250240
</ul>
251241
<txp:output_form form="ads_webinformer" />
252242
</div>

‎src/templates/pages/showcase.txp‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -85,20 +85,18 @@
8585
</div>
8686
<section>
8787
<h4 class="accessibility">List of site showcases</h4>
88-
<txp:etc_cache id="landing-showcases">
89-
<txp:article>
90-
<div class="showcases">
91-
<a href="<txp:permlink />">
92-
<txp:images limit="1">
93-
<txp:smd_thumbnail type="showcase-teaser-318w212h">
94-
<img class="img--showcase" width="318" height="212" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
95-
</txp:smd_thumbnail>
96-
</txp:images>
97-
</a>
98-
<h4><a href="<txp:permlink />"><txp:title /></a></h4>
99-
</div>
100-
</txp:article>
101-
</txp:etc_cache>
88+
<txp:article>
89+
<div class="showcases">
90+
<a href="<txp:permlink />">
91+
<txp:images limit="1">
92+
<txp:smd_thumbnail type="showcase-teaser-318w212h">
93+
<img class="img--showcase" width="318" height="212" alt="<txp:image_info type="alt" />" src="<txp:smd_thumbnail_info item="url" />" srcset="<txp:image_url /> 2x">
94+
</txp:smd_thumbnail>
95+
</txp:images>
96+
</a>
97+
<h4><a href="<txp:permlink />"><txp:title /></a></h4>
98+
</div>
99+
</txp:article>
102100
</section>
103101
<p class="alert-block information footnote"><strong>Disclaimer:</strong> Inclusion in this showcase is at the sole discretion of the The Textpattern Development Team. Any site may be removed at any time for any reason. The Textpattern Development Team is not directly responsible for any content or views expressed within third-party sites. See something wrong in this showcase? Please <a href="<txp:site_url />contact">contact us</a> and we’ll look into it.</p>
104102
</div>

‎src/templates/pages/version.txp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<txp:header value="application/json; charset=utf-8" /><txp:etc_cache id="version-json">{
1+
<txp:header value="application/json; charset=utf-8" />{
22
"textpattern-version": {
33
"release": "<txp:file_download_list category="current-release-zip" limit="1" break="" sort="created desc"><txp:file_download_name title /></txp:file_download_list>",
44
"prerelease": <txp:evaluate test="file_download_list">"<txp:file_download_list category="current-beta-release-zip" limit="1" break="" sort="created desc"><txp:file_download_name title /></txp:file_download_list>"<txp:else />null</txp:evaluate>
55
}
6-
}</txp:etc_cache>
6+
}

0 commit comments

Comments
 (0)