Changeset 2523719
- Timestamp:
- 04/29/2021 08:09:54 PM (5 years ago)
- Location:
- wppedia
- Files:
-
- 210 added
- 13 edited
-
tags/1.1.1 (added)
-
tags/1.1.1/.babelrc (added)
-
tags/1.1.1/.browserslistrc (added)
-
tags/1.1.1/.git (added)
-
tags/1.1.1/.git/HEAD (added)
-
tags/1.1.1/.git/config (added)
-
tags/1.1.1/.git/description (added)
-
tags/1.1.1/.git/hooks (added)
-
tags/1.1.1/.git/hooks/applypatch-msg.sample (added)
-
tags/1.1.1/.git/hooks/commit-msg.sample (added)
-
tags/1.1.1/.git/hooks/fsmonitor-watchman.sample (added)
-
tags/1.1.1/.git/hooks/post-update.sample (added)
-
tags/1.1.1/.git/hooks/pre-applypatch.sample (added)
-
tags/1.1.1/.git/hooks/pre-commit.sample (added)
-
tags/1.1.1/.git/hooks/pre-merge-commit.sample (added)
-
tags/1.1.1/.git/hooks/pre-push.sample (added)
-
tags/1.1.1/.git/hooks/pre-rebase.sample (added)
-
tags/1.1.1/.git/hooks/pre-receive.sample (added)
-
tags/1.1.1/.git/hooks/prepare-commit-msg.sample (added)
-
tags/1.1.1/.git/hooks/update.sample (added)
-
tags/1.1.1/.git/index (added)
-
tags/1.1.1/.git/info (added)
-
tags/1.1.1/.git/info/exclude (added)
-
tags/1.1.1/.git/logs (added)
-
tags/1.1.1/.git/logs/HEAD (added)
-
tags/1.1.1/.git/objects (added)
-
tags/1.1.1/.git/objects/info (added)
-
tags/1.1.1/.git/objects/pack (added)
-
tags/1.1.1/.git/objects/pack/pack-77a6b8d7186608577ae22729e8f8ddf60aa3144d.idx (added)
-
tags/1.1.1/.git/objects/pack/pack-77a6b8d7186608577ae22729e8f8ddf60aa3144d.pack (added)
-
tags/1.1.1/.git/packed-refs (added)
-
tags/1.1.1/.git/refs (added)
-
tags/1.1.1/.git/refs/heads (added)
-
tags/1.1.1/.git/refs/tags (added)
-
tags/1.1.1/.git/refs/tags/v1.0.0 (added)
-
tags/1.1.1/.git/refs/tags/v1.1.0 (added)
-
tags/1.1.1/.gitignore (added)
-
tags/1.1.1/CHANGELOG.md (added)
-
tags/1.1.1/CONTRIBUTING.md (added)
-
tags/1.1.1/LICENSE (added)
-
tags/1.1.1/README.md (added)
-
tags/1.1.1/assets (added)
-
tags/1.1.1/assets/img (added)
-
tags/1.1.1/assets/img/WPPedia-logo-vorlaeufig.svg (added)
-
tags/1.1.1/assets/img/WPPedia-pro-teaser.png (added)
-
tags/1.1.1/assets/img/encyclopedia.svg (added)
-
tags/1.1.1/assets/img/pro-badge.svg (added)
-
tags/1.1.1/assets/img/search.svg (added)
-
tags/1.1.1/assets/img/steinrein-logo.svg (added)
-
tags/1.1.1/assets/img/wppedia-logo.svg (added)
-
tags/1.1.1/assets/img/wppedia-pro-logo.svg (added)
-
tags/1.1.1/composer.json (added)
-
tags/1.1.1/composer.lock (added)
-
tags/1.1.1/core (added)
-
tags/1.1.1/core/classes (added)
-
tags/1.1.1/core/classes/WPPedia_Upgrade.php (added)
-
tags/1.1.1/core/classes/admin.php (added)
-
tags/1.1.1/core/classes/inline_style_collector.php (added)
-
tags/1.1.1/core/classes/modules (added)
-
tags/1.1.1/core/classes/modules/crosslinks.php (added)
-
tags/1.1.1/core/classes/modules/tooltip.php (added)
-
tags/1.1.1/core/classes/options.php (added)
-
tags/1.1.1/core/classes/post_meta.php (added)
-
tags/1.1.1/core/classes/post_type.php (added)
-
tags/1.1.1/core/classes/query_control.php (added)
-
tags/1.1.1/core/classes/rest_controller.php (added)
-
tags/1.1.1/core/classes/template.php (added)
-
tags/1.1.1/core/inc (added)
-
tags/1.1.1/core/inc/assets.php (added)
-
tags/1.1.1/core/inc/class.activation.php (added)
-
tags/1.1.1/core/inc/class.deactivation.php (added)
-
tags/1.1.1/core/inc/core-functions.php (added)
-
tags/1.1.1/core/inc/page-functions.php (added)
-
tags/1.1.1/core/inc/post-functions.php (added)
-
tags/1.1.1/core/inc/shortcodes.php (added)
-
tags/1.1.1/core/inc/template-functions.php (added)
-
tags/1.1.1/core/inc/utility-functions.php (added)
-
tags/1.1.1/dist (added)
-
tags/1.1.1/dist/css (added)
-
tags/1.1.1/dist/css/admin.bundle.js (added)
-
tags/1.1.1/dist/css/admin.min.css (added)
-
tags/1.1.1/dist/css/style.bundle.js (added)
-
tags/1.1.1/dist/css/style.min.css (added)
-
tags/1.1.1/dist/images (added)
-
tags/1.1.1/dist/images/encyclopedia.svg (added)
-
tags/1.1.1/dist/images/pro-badge.svg (added)
-
tags/1.1.1/dist/js (added)
-
tags/1.1.1/dist/js/ajax_tooltip.bundle.asset.php (added)
-
tags/1.1.1/dist/js/ajax_tooltip.bundle.js (added)
-
tags/1.1.1/dist/js/edit.bundle.asset.php (added)
-
tags/1.1.1/dist/js/edit.bundle.js (added)
-
tags/1.1.1/dist/js/search.bundle.asset.php (added)
-
tags/1.1.1/dist/js/search.bundle.js (added)
-
tags/1.1.1/dist/vendor (added)
-
tags/1.1.1/dist/vendor/tagify.css (added)
-
tags/1.1.1/dist/vendor/tagify.min.js (added)
-
tags/1.1.1/docs (added)
-
tags/1.1.1/docs/developers (added)
-
tags/1.1.1/docs/developers/readme.md (added)
-
tags/1.1.1/docs/readme.md (added)
-
tags/1.1.1/languages (added)
-
tags/1.1.1/languages/wppedia-de_DE.mo (added)
-
tags/1.1.1/languages/wppedia-de_DE.po (added)
-
tags/1.1.1/package-lock.json (added)
-
tags/1.1.1/package.json (added)
-
tags/1.1.1/postcss.config.js (added)
-
tags/1.1.1/readme.txt (added)
-
tags/1.1.1/source (added)
-
tags/1.1.1/source/js (added)
-
tags/1.1.1/source/js/admin (added)
-
tags/1.1.1/source/js/admin/edit (added)
-
tags/1.1.1/source/js/admin/edit/alternative-terms.js (added)
-
tags/1.1.1/source/js/admin/edit/edit.js (added)
-
tags/1.1.1/source/js/ajax-tooltips.js (added)
-
tags/1.1.1/source/js/utils (added)
-
tags/1.1.1/source/js/utils/ajax.js (added)
-
tags/1.1.1/source/js/utils/element.js (added)
-
tags/1.1.1/source/js/utils/index.js (added)
-
tags/1.1.1/source/js/utils/object.js (added)
-
tags/1.1.1/source/js/wppedia-search.js (added)
-
tags/1.1.1/source/scss (added)
-
tags/1.1.1/source/scss/_main.scss (added)
-
tags/1.1.1/source/scss/admin (added)
-
tags/1.1.1/source/scss/admin/_main.scss (added)
-
tags/1.1.1/source/scss/admin/layout.scss (added)
-
tags/1.1.1/source/scss/admin/notices.scss (added)
-
tags/1.1.1/source/scss/admin/options.scss (added)
-
tags/1.1.1/source/scss/admin/settings.scss (added)
-
tags/1.1.1/source/scss/components (added)
-
tags/1.1.1/source/scss/components.scss (added)
-
tags/1.1.1/source/scss/components/initial-char-navigation.scss (added)
-
tags/1.1.1/source/scss/components/searchbar.scss (added)
-
tags/1.1.1/source/scss/components/tooltip.scss (added)
-
tags/1.1.1/source/scss/options.scss (added)
-
tags/1.1.1/template-hooks (added)
-
tags/1.1.1/template-hooks/global.php (added)
-
tags/1.1.1/template-hooks/hooks.php (added)
-
tags/1.1.1/template-hooks/loop.php (added)
-
tags/1.1.1/template-hooks/nav.php (added)
-
tags/1.1.1/template-hooks/search.php (added)
-
tags/1.1.1/template-hooks/singular.php (added)
-
tags/1.1.1/templates (added)
-
tags/1.1.1/templates/archive.php (added)
-
tags/1.1.1/templates/content-archive.php (added)
-
tags/1.1.1/templates/content-single.php (added)
-
tags/1.1.1/templates/global (added)
-
tags/1.1.1/templates/global/sidebar.php (added)
-
tags/1.1.1/templates/global/wrapper-end.php (added)
-
tags/1.1.1/templates/global/wrapper-start.php (added)
-
tags/1.1.1/templates/loop (added)
-
tags/1.1.1/templates/loop/no-articles-found.php (added)
-
tags/1.1.1/templates/loop/wrapper-end.php (added)
-
tags/1.1.1/templates/loop/wrapper-start.php (added)
-
tags/1.1.1/templates/nav (added)
-
tags/1.1.1/templates/nav/char-navigation.php (added)
-
tags/1.1.1/templates/search (added)
-
tags/1.1.1/templates/search/form.php (added)
-
tags/1.1.1/templates/single.php (added)
-
tags/1.1.1/vendor (added)
-
tags/1.1.1/vendor/autoload.php (added)
-
tags/1.1.1/vendor/composer (added)
-
tags/1.1.1/vendor/composer/ClassLoader.php (added)
-
tags/1.1.1/vendor/composer/LICENSE (added)
-
tags/1.1.1/vendor/composer/autoload_classmap.php (added)
-
tags/1.1.1/vendor/composer/autoload_namespaces.php (added)
-
tags/1.1.1/vendor/composer/autoload_psr4.php (added)
-
tags/1.1.1/vendor/composer/autoload_real.php (added)
-
tags/1.1.1/vendor/composer/autoload_static.php (added)
-
tags/1.1.1/webpack.config.js (added)
-
tags/1.1.1/wppedia.php (added)
-
trunk/.git/FETCH_HEAD (modified) (1 diff)
-
trunk/.git/ORIG_HEAD (modified) (1 diff)
-
trunk/.git/index (modified) (previous)
-
trunk/.git/logs/HEAD (modified) (1 diff)
-
trunk/.git/logs/refs/heads/master (modified) (1 diff)
-
trunk/.git/logs/refs/remotes/origin/master (modified) (1 diff)
-
trunk/.git/objects/15 (added)
-
trunk/.git/objects/15/39edf62a9317e91efbdb1be5599d48a8b1a407 (added)
-
trunk/.git/objects/30 (added)
-
trunk/.git/objects/30/55fbe45de0d0d991d1686ddcd337cf2c172030 (added)
-
trunk/.git/objects/41 (added)
-
trunk/.git/objects/41/527e2e84e61cb57652cee1e50cbffe6ed8e549 (added)
-
trunk/.git/objects/42 (added)
-
trunk/.git/objects/42/88c4c0b3d8e1687b91831387eba33004cf2c62 (added)
-
trunk/.git/objects/45 (added)
-
trunk/.git/objects/45/0ffc89bb016d6f561abb4ddf35f4778e3effb5 (added)
-
trunk/.git/objects/46 (added)
-
trunk/.git/objects/46/323edd534d0eb05349892c67bf4c5ee1f592d2 (added)
-
trunk/.git/objects/4a (added)
-
trunk/.git/objects/4a/41a3c213e5dbb3fa10e7823dec1a05af5ff09c (added)
-
trunk/.git/objects/57 (added)
-
trunk/.git/objects/57/a8f0f26a1e515eeca7e68f8cd6263c8692d5e2 (added)
-
trunk/.git/objects/6f (added)
-
trunk/.git/objects/6f/2ef140b30c107fbc9b8ef727a3b16254978a7b (added)
-
trunk/.git/objects/90 (added)
-
trunk/.git/objects/90/728df044ef9c254be86f5b6cf91b69ed93ecba (added)
-
trunk/.git/objects/92 (added)
-
trunk/.git/objects/92/c44c7635418c1f0f4e181e46d0150a7c08a235 (added)
-
trunk/.git/objects/9c (added)
-
trunk/.git/objects/9c/060f99aa846ff051dd319e105d4e1e720202d2 (added)
-
trunk/.git/objects/a1 (added)
-
trunk/.git/objects/a1/6e6495dc015cbf9a3ba55f9c640fb4ca91bfb7 (added)
-
trunk/.git/objects/a3 (added)
-
trunk/.git/objects/a3/b6a36550b94072b8fd38feb68c4b0163fc42ef (added)
-
trunk/.git/objects/ab (added)
-
trunk/.git/objects/ab/4283e233fd21d4213a1bc617cb3b9ac4ca8eaa (added)
-
trunk/.git/objects/bc (added)
-
trunk/.git/objects/bc/1822abeb010aa1f48863b4fbb3eb92bc982890 (added)
-
trunk/.git/objects/d2 (added)
-
trunk/.git/objects/d2/9a15d0be8ddf8626213dcb5e89b2f0f15574ad (added)
-
trunk/.git/objects/d5 (added)
-
trunk/.git/objects/d5/44f9b7474be7d38a1f25a0180468c08fc8106c (added)
-
trunk/.git/objects/f2 (added)
-
trunk/.git/objects/f2/461c4a011df493aeab8d85a4b1c06e25cef736 (added)
-
trunk/.git/objects/f3 (added)
-
trunk/.git/objects/f3/03ec7695c1c6dcfa2f852e9e575ad8f9e6205e (added)
-
trunk/.git/refs/heads/master (modified) (1 diff)
-
trunk/.git/refs/remotes/origin/master (modified) (1 diff)
-
trunk/CHANGELOG.md (modified) (1 diff)
-
trunk/core/classes/query_control.php (modified) (3 diffs)
-
trunk/core/inc/page-functions.php (modified) (1 diff)
-
trunk/readme.txt (modified) (2 diffs)
-
trunk/wppedia.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
wppedia/trunk/.git/FETCH_HEAD
r2523688 r2523719 1 0d46ee74d0678a91817db770113e5ebe93f25531branch 'master' of https://github.com/bfiessinger/wppedia1 a3b6a36550b94072b8fd38feb68c4b0163fc42ef branch 'master' of https://github.com/bfiessinger/wppedia -
wppedia/trunk/.git/ORIG_HEAD
r2523688 r2523719 1 f6435655cc85b1ec024ff57d4a9b395125f23514 1 0d46ee74d0678a91817db770113e5ebe93f25531 -
wppedia/trunk/.git/logs/HEAD
r2523688 r2523719 1 1 0000000000000000000000000000000000000000 f6435655cc85b1ec024ff57d4a9b395125f23514 Bastian Fießinger <41627893+bfiessinger@users.noreply.github.com> 1618395211 +0200 clone: from https://github.com/bfiessinger/wppedia.git 2 2 f6435655cc85b1ec024ff57d4a9b395125f23514 0d46ee74d0678a91817db770113e5ebe93f25531 Bastian Fießinger <41627893+bfiessinger@users.noreply.github.com> 1619721620 +0200 pull origin master: Fast-forward 3 0d46ee74d0678a91817db770113e5ebe93f25531 a3b6a36550b94072b8fd38feb68c4b0163fc42ef Bastian Fießinger <41627893+bfiessinger@users.noreply.github.com> 1619726857 +0200 pull origin master: Fast-forward -
wppedia/trunk/.git/logs/refs/heads/master
r2523688 r2523719 1 1 0000000000000000000000000000000000000000 f6435655cc85b1ec024ff57d4a9b395125f23514 Bastian Fießinger <41627893+bfiessinger@users.noreply.github.com> 1618395211 +0200 clone: from https://github.com/bfiessinger/wppedia.git 2 2 f6435655cc85b1ec024ff57d4a9b395125f23514 0d46ee74d0678a91817db770113e5ebe93f25531 Bastian Fießinger <41627893+bfiessinger@users.noreply.github.com> 1619721620 +0200 pull origin master: Fast-forward 3 0d46ee74d0678a91817db770113e5ebe93f25531 a3b6a36550b94072b8fd38feb68c4b0163fc42ef Bastian Fießinger <41627893+bfiessinger@users.noreply.github.com> 1619726857 +0200 pull origin master: Fast-forward -
wppedia/trunk/.git/logs/refs/remotes/origin/master
r2523688 r2523719 1 1 f6435655cc85b1ec024ff57d4a9b395125f23514 0d46ee74d0678a91817db770113e5ebe93f25531 Bastian Fießinger <41627893+bfiessinger@users.noreply.github.com> 1619721620 +0200 pull origin master: fast-forward 2 0d46ee74d0678a91817db770113e5ebe93f25531 a3b6a36550b94072b8fd38feb68c4b0163fc42ef Bastian Fießinger <41627893+bfiessinger@users.noreply.github.com> 1619726857 +0200 pull origin master: fast-forward -
wppedia/trunk/.git/refs/heads/master
r2523688 r2523719 1 0d46ee74d0678a91817db770113e5ebe93f25531 1 a3b6a36550b94072b8fd38feb68c4b0163fc42ef -
wppedia/trunk/.git/refs/remotes/origin/master
r2523688 r2523719 1 0d46ee74d0678a91817db770113e5ebe93f25531 1 a3b6a36550b94072b8fd38feb68c4b0163fc42ef -
wppedia/trunk/CHANGELOG.md
r2523688 r2523719 1 1 # Changelog 2 3 ## 1.1.1 4 ### Bug fixes 5 - fixed posts per page was unable to change on glossary archives 6 - fixed orderby was set wrong in some situations 2 7 3 8 ## 1.1.0 -
wppedia/trunk/core/classes/query_control.php
r2523688 r2523719 94 94 */ 95 95 function default_wiki_entries_orderby( $query ) { 96 97 if( ! $query->is_main_query() || ! is_wppedia_page() ) 96 if(!$query->is_main_query() || $query->get('post_type') !== wppedia_get_post_type()) 98 97 return $query; 99 98 … … 107 106 108 107 return $query; 109 110 108 } 111 109 … … 116 114 */ 117 115 function default_posts_per_page( $query ) { 118 119 if ( ! is_admin() && $query->is_main_query() && $query->is_archive() ) 116 if (!is_admin() && $query->is_main_query() && $query->is_archive() && ($query->get('post_type') === wppedia_get_post_type() || $query->get('wppedia_initial_letter') !== '')) 120 117 $query->set( 'posts_per_page', get_option('wppedia_posts_per_page', 25) ); 121 118 122 119 return $query; 123 124 120 } 125 121 -
wppedia/trunk/core/inc/page-functions.php
r2523688 r2523719 75 75 */ 76 76 function is_wppedia_archive() { 77 return is_post_type_archive(wppedia_get_post_type());77 return (is_post_type_archive(wppedia_get_post_type()) || (is_tax() && get_post_type() === wppedia_get_post_type())); 78 78 } 79 79 -
wppedia/trunk/readme.txt
r2523688 r2523719 2 2 Contributors: bastianfiessinger 3 3 Tested up to: 5.7.1 4 Stable tag: 1.1. 04 Stable tag: 1.1.1 5 5 Tags: glossary, encyclopedia, wiki, vocabulary, dictionary, tooltip, lexicon, clavis 6 6 License: GPLv3 or later … … 124 124 == Changelog == 125 125 126 = 1.1.1 = 127 ### Bug fixes 128 - fixed posts per page was unable to change on glossary archives 129 - fixed orderby was set wrong in some situations 130 126 131 = 1.1.0 = 127 132 ### New Features -
wppedia/trunk/wppedia.php
r2523688 r2523719 3 3 /** 4 4 * WPPedia - The most advanced Glossary solution for WordPress! 5 *6 * @since 1.1.07 5 * 8 6 * @wordpress-plugin … … 12 10 * Author: Bastian Fießinger 13 11 * AuthorURI: https://github.com/bfiessinger/ 14 * Version: 1.1. 012 * Version: 1.1.1 15 13 * Text Domain: wppedia 16 14 */ … … 66 64 private function define_constants() { 67 65 68 wppedia_maybe_define_constant('wpPediaPluginVersion', '1.1. 0');66 wppedia_maybe_define_constant('wpPediaPluginVersion', '1.1.1'); 69 67 70 68 // Path Constants
Note: See TracChangeset
for help on using the changeset viewer.