From 03dda8144c9402e96835cc9950011aac68f73529 Mon Sep 17 00:00:00 2001 From: Shish Date: Sun, 25 Oct 2020 10:44:30 +0000 Subject: [PATCH] pull microcrud update to fix r__size issue --- composer.lock | 170 +++++++++++++++++++++--------------------- ext/log_db/main.php | 2 +- ext/tag_list/main.php | 53 +++++++------ 3 files changed, 117 insertions(+), 108 deletions(-) diff --git a/composer.lock b/composer.lock index 4e588969..8946745d 100644 --- a/composer.lock +++ b/composer.lock @@ -369,16 +369,16 @@ }, { "name": "shish/microcrud", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/shish/microcrud.git", - "reference": "cc254dd1fe831b096b7ec95f6b5374a00b273d5d" + "reference": "c4be2183bb336c8c222d1badc81069ec0334b649" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/shish/microcrud/zipball/cc254dd1fe831b096b7ec95f6b5374a00b273d5d", - "reference": "cc254dd1fe831b096b7ec95f6b5374a00b273d5d", + "url": "https://api.github.com/repos/shish/microcrud/zipball/c4be2183bb336c8c222d1badc81069ec0334b649", + "reference": "c4be2183bb336c8c222d1badc81069ec0334b649", "shasum": "" }, "require": { @@ -414,7 +414,7 @@ "crud", "generator" ], - "time": "2020-10-24T15:35:13+00:00" + "time": "2020-10-25T10:39:48+00:00" }, { "name": "shish/microhtml", @@ -959,12 +959,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "4419c7609b40a3320d78d5f6dd9704d37497d538" + "reference": "23cfad3f1b73598c7aa86e9e55a682d3a74221c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4419c7609b40a3320d78d5f6dd9704d37497d538", - "reference": "4419c7609b40a3320d78d5f6dd9704d37497d538", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/23cfad3f1b73598c7aa86e9e55a682d3a74221c7", + "reference": "23cfad3f1b73598c7aa86e9e55a682d3a74221c7", "shasum": "" }, "require": { @@ -1024,7 +1024,7 @@ "type": "github" } ], - "time": "2020-10-24T11:04:06+00:00" + "time": "2020-10-25T05:50:29+00:00" }, { "name": "phpunit/php-file-iterator", @@ -1032,12 +1032,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "43765261eacd8f23cdfaa9ddda98d9c97f77d467" + "reference": "385204a8869356bfee55ac1fa51e64811317921b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/43765261eacd8f23cdfaa9ddda98d9c97f77d467", - "reference": "43765261eacd8f23cdfaa9ddda98d9c97f77d467", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/385204a8869356bfee55ac1fa51e64811317921b", + "reference": "385204a8869356bfee55ac1fa51e64811317921b", "shasum": "" }, "require": { @@ -1080,7 +1080,7 @@ "type": "github" } ], - "time": "2020-10-24T11:20:46+00:00" + "time": "2020-10-25T06:24:31+00:00" }, { "name": "phpunit/php-invoker", @@ -1088,12 +1088,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-invoker.git", - "reference": "d52743063ec856a9ca53362ed7ef5c24686fc871" + "reference": "ab10b372e09f0235ee296f86e50d3ff887ff407d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/d52743063ec856a9ca53362ed7ef5c24686fc871", - "reference": "d52743063ec856a9ca53362ed7ef5c24686fc871", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/ab10b372e09f0235ee296f86e50d3ff887ff407d", + "reference": "ab10b372e09f0235ee296f86e50d3ff887ff407d", "shasum": "" }, "require": { @@ -1139,7 +1139,7 @@ "type": "github" } ], - "time": "2020-10-24T11:18:41+00:00" + "time": "2020-10-25T06:25:14+00:00" }, { "name": "phpunit/php-text-template", @@ -1147,12 +1147,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "8ccb4c520ff69fb8d41f4ff46396fbe90f5e44e3" + "reference": "53f18a3fd246d1570449e8953cb601271738fc02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/8ccb4c520ff69fb8d41f4ff46396fbe90f5e44e3", - "reference": "8ccb4c520ff69fb8d41f4ff46396fbe90f5e44e3", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/53f18a3fd246d1570449e8953cb601271738fc02", + "reference": "53f18a3fd246d1570449e8953cb601271738fc02", "shasum": "" }, "require": { @@ -1194,7 +1194,7 @@ "type": "github" } ], - "time": "2020-10-24T11:19:31+00:00" + "time": "2020-10-25T06:27:16+00:00" }, { "name": "phpunit/php-timer", @@ -1202,12 +1202,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "0ae22e1dbe90be32cf60bfe5ab2ce657059a732b" + "reference": "3cc2b2ac8fa3195e68650223d976a1ca83521fb0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/0ae22e1dbe90be32cf60bfe5ab2ce657059a732b", - "reference": "0ae22e1dbe90be32cf60bfe5ab2ce657059a732b", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3cc2b2ac8fa3195e68650223d976a1ca83521fb0", + "reference": "3cc2b2ac8fa3195e68650223d976a1ca83521fb0", "shasum": "" }, "require": { @@ -1249,7 +1249,7 @@ "type": "github" } ], - "time": "2020-10-24T11:21:31+00:00" + "time": "2020-10-25T06:25:47+00:00" }, { "name": "phpunit/phpunit", @@ -1257,12 +1257,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f27cc08ef608f8d1177726d374b18ccdfc2906b9" + "reference": "c5877cdd5f37f54f6493cad8e22a7cd82ea37ae1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f27cc08ef608f8d1177726d374b18ccdfc2906b9", - "reference": "f27cc08ef608f8d1177726d374b18ccdfc2906b9", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c5877cdd5f37f54f6493cad8e22a7cd82ea37ae1", + "reference": "c5877cdd5f37f54f6493cad8e22a7cd82ea37ae1", "shasum": "" }, "require": { @@ -1348,7 +1348,7 @@ "type": "github" } ], - "time": "2020-10-24T11:01:38+00:00" + "time": "2020-10-25T10:36:59+00:00" }, { "name": "sebastian/cli-parser", @@ -1356,12 +1356,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/cli-parser.git", - "reference": "ef369ec603343ca81abe72cb5235f851d7cb4c4c" + "reference": "1933e8301345e43bf23cb0f5681b2f0470f8dc12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/ef369ec603343ca81abe72cb5235f851d7cb4c4c", - "reference": "ef369ec603343ca81abe72cb5235f851d7cb4c4c", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/1933e8301345e43bf23cb0f5681b2f0470f8dc12", + "reference": "1933e8301345e43bf23cb0f5681b2f0470f8dc12", "shasum": "" }, "require": { @@ -1400,7 +1400,7 @@ "type": "github" } ], - "time": "2020-10-24T11:19:45+00:00" + "time": "2020-10-25T06:28:20+00:00" }, { "name": "sebastian/code-unit", @@ -1408,12 +1408,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit.git", - "reference": "d3a498107d2b8f0a88ba26e6300894c8f3435fcd" + "reference": "a915c3324c8adb20a977dcc41652b1baddfc2481" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/d3a498107d2b8f0a88ba26e6300894c8f3435fcd", - "reference": "d3a498107d2b8f0a88ba26e6300894c8f3435fcd", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/a915c3324c8adb20a977dcc41652b1baddfc2481", + "reference": "a915c3324c8adb20a977dcc41652b1baddfc2481", "shasum": "" }, "require": { @@ -1452,7 +1452,7 @@ "type": "github" } ], - "time": "2020-10-24T11:23:10+00:00" + "time": "2020-10-25T06:18:25+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -1460,12 +1460,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "3aae307c56c25d3865e1ccfec509ab6e29625b5a" + "reference": "79ac992470b086c67e048642f680f85669a11749" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/3aae307c56c25d3865e1ccfec509ab6e29625b5a", - "reference": "3aae307c56c25d3865e1ccfec509ab6e29625b5a", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/79ac992470b086c67e048642f680f85669a11749", + "reference": "79ac992470b086c67e048642f680f85669a11749", "shasum": "" }, "require": { @@ -1503,7 +1503,7 @@ "type": "github" } ], - "time": "2020-10-24T11:22:53+00:00" + "time": "2020-10-25T06:20:03+00:00" }, { "name": "sebastian/comparator", @@ -1511,12 +1511,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "c4c2a852c9876c9eb4b07cb84c0b8a50a98f4c37" + "reference": "fab20c3cc38385c380ab34a94a929edee03abec3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c4c2a852c9876c9eb4b07cb84c0b8a50a98f4c37", - "reference": "c4c2a852c9876c9eb4b07cb84c0b8a50a98f4c37", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/fab20c3cc38385c380ab34a94a929edee03abec3", + "reference": "fab20c3cc38385c380ab34a94a929edee03abec3", "shasum": "" }, "require": { @@ -1573,7 +1573,7 @@ "type": "github" } ], - "time": "2020-10-24T11:21:44+00:00" + "time": "2020-10-25T06:20:36+00:00" }, { "name": "sebastian/complexity", @@ -1581,12 +1581,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/complexity.git", - "reference": "6af9bea73cef45595936025c9957783866e463d6" + "reference": "811e7223691baa38c4c80a85b13bfdee6d7aae44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/6af9bea73cef45595936025c9957783866e463d6", - "reference": "6af9bea73cef45595936025c9957783866e463d6", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/811e7223691baa38c4c80a85b13bfdee6d7aae44", + "reference": "811e7223691baa38c4c80a85b13bfdee6d7aae44", "shasum": "" }, "require": { @@ -1626,7 +1626,7 @@ "type": "github" } ], - "time": "2020-10-24T11:19:17+00:00" + "time": "2020-10-25T07:06:22+00:00" }, { "name": "sebastian/diff", @@ -1634,12 +1634,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "f643ca22b0104e2dd374bb1d395f7c20cf92bdca" + "reference": "790c84b76a614ebeb7b4d3465f3fff4b904a8cd5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/f643ca22b0104e2dd374bb1d395f7c20cf92bdca", - "reference": "f643ca22b0104e2dd374bb1d395f7c20cf92bdca", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/790c84b76a614ebeb7b4d3465f3fff4b904a8cd5", + "reference": "790c84b76a614ebeb7b4d3465f3fff4b904a8cd5", "shasum": "" }, "require": { @@ -1688,7 +1688,7 @@ "type": "github" } ], - "time": "2020-10-24T11:15:28+00:00" + "time": "2020-10-25T06:21:07+00:00" }, { "name": "sebastian/environment", @@ -1696,12 +1696,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "6ab0d109fd207bb236939d4fa1ff5665b3ec32d4" + "reference": "9a212b684906d5a2379ee48051dd09eba3ae35b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6ab0d109fd207bb236939d4fa1ff5665b3ec32d4", - "reference": "6ab0d109fd207bb236939d4fa1ff5665b3ec32d4", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/9a212b684906d5a2379ee48051dd09eba3ae35b6", + "reference": "9a212b684906d5a2379ee48051dd09eba3ae35b6", "shasum": "" }, "require": { @@ -1747,7 +1747,7 @@ "type": "github" } ], - "time": "2020-10-24T11:22:36+00:00" + "time": "2020-10-25T06:21:41+00:00" }, { "name": "sebastian/exporter", @@ -1755,12 +1755,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "12fc29af0678d9813151374da45a4bb613b99dd5" + "reference": "cb871c11986063dbab259ed33ba34f57767f395d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/12fc29af0678d9813151374da45a4bb613b99dd5", - "reference": "12fc29af0678d9813151374da45a4bb613b99dd5", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/cb871c11986063dbab259ed33ba34f57767f395d", + "reference": "cb871c11986063dbab259ed33ba34f57767f395d", "shasum": "" }, "require": { @@ -1820,7 +1820,7 @@ "type": "github" } ], - "time": "2020-10-24T11:22:00+00:00" + "time": "2020-10-25T06:22:14+00:00" }, { "name": "sebastian/global-state", @@ -1828,12 +1828,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "c7d087db08388a5667934e9f9f6c214eb1541a68" + "reference": "25de8ae1e6e568fc5af7fd68afec845297758530" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/c7d087db08388a5667934e9f9f6c214eb1541a68", - "reference": "c7d087db08388a5667934e9f9f6c214eb1541a68", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/25de8ae1e6e568fc5af7fd68afec845297758530", + "reference": "25de8ae1e6e568fc5af7fd68afec845297758530", "shasum": "" }, "require": { @@ -1880,7 +1880,7 @@ "type": "github" } ], - "time": "2020-10-24T11:22:17+00:00" + "time": "2020-10-25T06:22:42+00:00" }, { "name": "sebastian/lines-of-code", @@ -1888,12 +1888,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/lines-of-code.git", - "reference": "94969f06ee8f77521d6431bf8fe67c0a0672ce7c" + "reference": "50d69536f21f65087b60245b539af929a5baafdd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/94969f06ee8f77521d6431bf8fe67c0a0672ce7c", - "reference": "94969f06ee8f77521d6431bf8fe67c0a0672ce7c", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/50d69536f21f65087b60245b539af929a5baafdd", + "reference": "50d69536f21f65087b60245b539af929a5baafdd", "shasum": "" }, "require": { @@ -1933,7 +1933,7 @@ "type": "github" } ], - "time": "2020-10-24T11:18:21+00:00" + "time": "2020-10-25T06:28:45+00:00" }, { "name": "sebastian/object-enumerator", @@ -1941,12 +1941,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "7d2c0e3b4676cf482bb28b47a409f49085fe9831" + "reference": "89c3b96bba436a6f1dd6bd2a1e5d40359a74eef3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7d2c0e3b4676cf482bb28b47a409f49085fe9831", - "reference": "7d2c0e3b4676cf482bb28b47a409f49085fe9831", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/89c3b96bba436a6f1dd6bd2a1e5d40359a74eef3", + "reference": "89c3b96bba436a6f1dd6bd2a1e5d40359a74eef3", "shasum": "" }, "require": { @@ -1986,7 +1986,7 @@ "type": "github" } ], - "time": "2020-10-24T11:21:15+00:00" + "time": "2020-10-25T06:23:34+00:00" }, { "name": "sebastian/object-reflector", @@ -1994,12 +1994,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "91b42989002a607825aaad77dd968d028e45791f" + "reference": "b74acf4d0c17fa2fa6bcfa04637cc31834eeb878" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/91b42989002a607825aaad77dd968d028e45791f", - "reference": "91b42989002a607825aaad77dd968d028e45791f", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b74acf4d0c17fa2fa6bcfa04637cc31834eeb878", + "reference": "b74acf4d0c17fa2fa6bcfa04637cc31834eeb878", "shasum": "" }, "require": { @@ -2037,7 +2037,7 @@ "type": "github" } ], - "time": "2020-10-24T11:21:03+00:00" + "time": "2020-10-25T06:24:10+00:00" }, { "name": "sebastian/recursion-context", @@ -2045,12 +2045,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "de8e49bafdc8da3bc2478429a91b6972858a0150" + "reference": "df914a3bfeb177c12a02f9055bec222e0bbe55e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/de8e49bafdc8da3bc2478429a91b6972858a0150", - "reference": "de8e49bafdc8da3bc2478429a91b6972858a0150", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/df914a3bfeb177c12a02f9055bec222e0bbe55e3", + "reference": "df914a3bfeb177c12a02f9055bec222e0bbe55e3", "shasum": "" }, "require": { @@ -2096,7 +2096,7 @@ "type": "github" } ], - "time": "2020-10-24T11:20:29+00:00" + "time": "2020-10-25T06:26:18+00:00" }, { "name": "sebastian/resource-operations", @@ -2155,12 +2155,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/type.git", - "reference": "20a32f90da048a3c765d30d8a79f5794d88bf843" + "reference": "8507d8be61e318f97dc603c69bf11273fcf8ae3f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/20a32f90da048a3c765d30d8a79f5794d88bf843", - "reference": "20a32f90da048a3c765d30d8a79f5794d88bf843", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/8507d8be61e318f97dc603c69bf11273fcf8ae3f", + "reference": "8507d8be61e318f97dc603c69bf11273fcf8ae3f", "shasum": "" }, "require": { @@ -2199,7 +2199,7 @@ "type": "github" } ], - "time": "2020-10-24T11:20:12+00:00" + "time": "2020-10-25T06:26:47+00:00" }, { "name": "sebastian/version", diff --git a/ext/log_db/main.php b/ext/log_db/main.php index a6ffd357..c25e8bde 100644 --- a/ext/log_db/main.php +++ b/ext/log_db/main.php @@ -189,7 +189,7 @@ class LogTable extends Table $this->table = "score_log"; $this->base_query = "SELECT * FROM score_log"; $this->size = 100; - $this->limit = 1000000; + $this->limit = 100000; $this->set_columns([ new ShortDateTimeColumn("date_sent", "Time"), new TextColumn("section", "Module"), diff --git a/ext/tag_list/main.php b/ext/tag_list/main.php index fee5d483..be669b33 100644 --- a/ext/tag_list/main.php +++ b/ext/tag_list/main.php @@ -268,21 +268,24 @@ class TagList extends Extension $starts_with = $this->get_starts_with(); // check if we have a cached version - $cache_key = warehouse_path("cache/tag_cloud", md5("tc" . $tags_min . $starts_with)); + $cache_key = warehouse_path( + "cache/tag_cloud", + md5("tc" . $tags_min . $starts_with . VERSION) + ); if (file_exists($cache_key)) { return file_get_contents($cache_key); } // SHIT: PDO/pgsql has problems using the same named param twice -_-;; $tag_data = $database->get_all(" - SELECT - tag, - FLOOR(LOG(2.7, LOG(2.7, count - :tags_min2 + 1)+1)*1.5*100)/100 AS scaled - FROM tags - WHERE count >= :tags_min - AND LOWER(tag) LIKE LOWER(:starts_with) - ORDER BY LOWER(tag) - ", ["tags_min"=>$tags_min, "tags_min2"=>$tags_min, "starts_with"=>$starts_with]); + SELECT + tag, + FLOOR(LOG(2.7, LOG(2.7, count - :tags_min2 + 1)+1)*1.5*100)/100 AS scaled + FROM tags + WHERE count >= :tags_min + AND LOWER(tag) LIKE LOWER(:starts_with) + ORDER BY LOWER(tag) + ", ["tags_min"=>$tags_min, "tags_min2"=>$tags_min, "starts_with"=>$starts_with]); $html = ""; if ($config->get_bool(TagListConfig::PAGES)) { @@ -321,18 +324,21 @@ class TagList extends Extension $starts_with = $this->get_starts_with(); // check if we have a cached version - $cache_key = warehouse_path("cache/tag_alpha", md5("ta" . $tags_min . $starts_with)); + $cache_key = warehouse_path( + "cache/tag_alpha", + md5("ta" . $tags_min . $starts_with . VERSION) + ); if (file_exists($cache_key)) { return file_get_contents($cache_key); } $tag_data = $database->get_pairs(" - SELECT tag, count - FROM tags - WHERE count >= :tags_min - AND LOWER(tag) LIKE LOWER(:starts_with) - ORDER BY LOWER(tag) - ", ["tags_min"=>$tags_min, "starts_with"=>$starts_with]); + SELECT tag, count + FROM tags + WHERE count >= :tags_min + AND LOWER(tag) LIKE LOWER(:starts_with) + ORDER BY LOWER(tag) + ", ["tags_min"=>$tags_min, "starts_with"=>$starts_with]); $html = ""; if ($config->get_bool(TagListConfig::PAGES)) { @@ -399,17 +405,20 @@ class TagList extends Extension } // check if we have a cached version - $cache_key = warehouse_path("cache/tag_popul", md5("tp" . $tags_min)); + $cache_key = warehouse_path( + "cache/tag_popul", + md5("tp" . $tags_min . VERSION) + ); if (file_exists($cache_key)) { return file_get_contents($cache_key); } $tag_data = $database->get_all(" - SELECT tag, count, FLOOR(LOG(count)) AS scaled - FROM tags - WHERE count >= :tags_min - ORDER BY count DESC, tag ASC - ", ["tags_min"=>$tags_min]); + SELECT tag, count, FLOOR(LOG(count)) AS scaled + FROM tags + WHERE count >= :tags_min + ORDER BY count DESC, tag ASC + ", ["tags_min"=>$tags_min]); $html = "Results grouped by log10(n)"; $lastLog = "";