@@ -14,84 +14,84 @@ discard block |
||
14 | 14 | if (!is_blog_installed()) { return; } |
15 | 15 | |
16 | 16 | class Autoloader { |
17 | - private static $cache; // Stores our plugin cache and site option. |
|
18 | - private static $auto_plugins; // Contains the autoloaded plugins (only when needed). |
|
19 | - private static $mu_plugins; // Contains the mu plugins (only when needed). |
|
20 | - private static $count; // Contains the plugin count. |
|
21 | - private static $activated; // Newly activated plugins. |
|
22 | - private static $relative_path; // Relative path to the mu-plugins dir. |
|
23 | - private static $_single; // Let's make this a singleton. |
|
24 | - |
|
25 | - public function __construct() { |
|
17 | + private static $cache; // Stores our plugin cache and site option. |
|
18 | + private static $auto_plugins; // Contains the autoloaded plugins (only when needed). |
|
19 | + private static $mu_plugins; // Contains the mu plugins (only when needed). |
|
20 | + private static $count; // Contains the plugin count. |
|
21 | + private static $activated; // Newly activated plugins. |
|
22 | + private static $relative_path; // Relative path to the mu-plugins dir. |
|
23 | + private static $_single; // Let's make this a singleton. |
|
24 | + |
|
25 | + public function __construct() { |
|
26 | 26 | if (isset(self::$_single)) { return; } |
27 | 27 | |
28 | 28 | self::$_single = $this; // Singleton set. |
29 | 29 | self::$relative_path = '/../' . basename(__DIR__); // Rel path set. |
30 | 30 | |
31 | 31 | if (is_admin()) { |
32 | - add_filter('show_advanced_plugins', array($this, 'showInAdmin'), 0, 2); // Admin only filter. |
|
32 | + add_filter('show_advanced_plugins', array($this, 'showInAdmin'), 0, 2); // Admin only filter. |
|
33 | 33 | } |
34 | 34 | |
35 | 35 | $this->loadPlugins(); |
36 | - } |
|
36 | + } |
|
37 | 37 | |
38 | - /** |
|
39 | - * Run some checks then autoload our plugins. |
|
40 | - */ |
|
41 | - public function loadPlugins() { |
|
38 | + /** |
|
39 | + * Run some checks then autoload our plugins. |
|
40 | + */ |
|
41 | + public function loadPlugins() { |
|
42 | 42 | $this->checkCache(); |
43 | 43 | $this->validatePlugins(); |
44 | 44 | $this->countPlugins(); |
45 | 45 | |
46 | 46 | foreach (self::$cache['plugins'] as $plugin_file => $plugin_info) { |
47 | - include_once(WPMU_PLUGIN_DIR . '/' . $plugin_file); |
|
47 | + include_once(WPMU_PLUGIN_DIR . '/' . $plugin_file); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | $this->pluginHooks(); |
51 | - } |
|
51 | + } |
|
52 | 52 | |
53 | - /** |
|
54 | - * Filter show_advanced_plugins to display the autoloaded plugins. |
|
55 | - */ |
|
56 | - public function showInAdmin($bool, $type) { |
|
53 | + /** |
|
54 | + * Filter show_advanced_plugins to display the autoloaded plugins. |
|
55 | + */ |
|
56 | + public function showInAdmin($bool, $type) { |
|
57 | 57 | $screen = get_current_screen(); |
58 | 58 | $current = is_multisite() ? 'plugins-network' : 'plugins'; |
59 | 59 | |
60 | 60 | if ($screen->{'base'} != $current || $type != 'mustuse' || !current_user_can('activate_plugins')) { |
61 | - return $bool; |
|
61 | + return $bool; |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | $this->updateCache(); // May as well update the transient cache whilst here. |
65 | 65 | |
66 | 66 | self::$auto_plugins = array_map(function ($auto_plugin) { |
67 | - $auto_plugin['Name'] .= ' *'; |
|
68 | - return $auto_plugin; |
|
67 | + $auto_plugin['Name'] .= ' *'; |
|
68 | + return $auto_plugin; |
|
69 | 69 | }, self::$auto_plugins); |
70 | 70 | |
71 | 71 | $GLOBALS['plugins']['mustuse'] = array_unique(array_merge(self::$auto_plugins, self::$mu_plugins), SORT_REGULAR); |
72 | 72 | |
73 | 73 | return false; // Prevent WordPress overriding our work. |
74 | - } |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * This sets the cache or calls for an update |
|
78 | - */ |
|
79 | - private function checkCache() { |
|
76 | + /** |
|
77 | + * This sets the cache or calls for an update |
|
78 | + */ |
|
79 | + private function checkCache() { |
|
80 | 80 | $cache = get_site_option('bedrock_autoloader'); |
81 | 81 | |
82 | 82 | if ($cache === false) { |
83 | - return $this->updateCache(); |
|
83 | + return $this->updateCache(); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | self::$cache = $cache; |
87 | - } |
|
88 | - |
|
89 | - /** |
|
90 | - * Get the plugins and mu-plugins from the mu-plugin path and remove duplicates. |
|
91 | - * Check cache against current plugins for newly activated plugins. |
|
92 | - * After that, we can update the cache. |
|
93 | - */ |
|
94 | - private function updateCache() { |
|
87 | + } |
|
88 | + |
|
89 | + /** |
|
90 | + * Get the plugins and mu-plugins from the mu-plugin path and remove duplicates. |
|
91 | + * Check cache against current plugins for newly activated plugins. |
|
92 | + * After that, we can update the cache. |
|
93 | + */ |
|
94 | + private function updateCache() { |
|
95 | 95 | require_once(ABSPATH . 'wp-admin/includes/plugin.php'); |
96 | 96 | |
97 | 97 | self::$auto_plugins = get_plugins(self::$relative_path); |
@@ -102,49 +102,49 @@ discard block |
||
102 | 102 | self::$cache = array('plugins' => $plugins, 'count' => $this->countPlugins()); |
103 | 103 | |
104 | 104 | update_site_option('bedrock_autoloader', self::$cache); |
105 | - } |
|
106 | - |
|
107 | - /** |
|
108 | - * This accounts for the plugin hooks that would run if the plugins were |
|
109 | - * loaded as usual. Plugins are removed by deletion, so there's no way |
|
110 | - * to deactivate or uninstall. |
|
111 | - */ |
|
112 | - private function pluginHooks() { |
|
105 | + } |
|
106 | + |
|
107 | + /** |
|
108 | + * This accounts for the plugin hooks that would run if the plugins were |
|
109 | + * loaded as usual. Plugins are removed by deletion, so there's no way |
|
110 | + * to deactivate or uninstall. |
|
111 | + */ |
|
112 | + private function pluginHooks() { |
|
113 | 113 | if (!is_array(self::$activated)) { return; } |
114 | 114 | |
115 | 115 | foreach (self::$activated as $plugin_file => $plugin_info) { |
116 | - do_action('activate_' . $plugin_file); |
|
116 | + do_action('activate_' . $plugin_file); |
|
117 | + } |
|
117 | 118 | } |
118 | - } |
|
119 | 119 | |
120 | - /** |
|
121 | - * Check that the plugin file exists, if it doesn't update the cache. |
|
122 | - */ |
|
123 | - private function validatePlugins() { |
|
120 | + /** |
|
121 | + * Check that the plugin file exists, if it doesn't update the cache. |
|
122 | + */ |
|
123 | + private function validatePlugins() { |
|
124 | 124 | foreach (self::$cache['plugins'] as $plugin_file => $plugin_info) { |
125 | - if (!file_exists(WPMU_PLUGIN_DIR . '/' . $plugin_file)) { |
|
125 | + if (!file_exists(WPMU_PLUGIN_DIR . '/' . $plugin_file)) { |
|
126 | 126 | $this->updateCache(); |
127 | 127 | break; |
128 | - } |
|
128 | + } |
|
129 | + } |
|
129 | 130 | } |
130 | - } |
|
131 | 131 | |
132 | - /** |
|
133 | - * Count our plugins (but only once) by counting the top level folders in the |
|
134 | - * mu-plugins dir. If it's more or less than last time, update the cache. |
|
135 | - */ |
|
136 | - private function countPlugins() { |
|
132 | + /** |
|
133 | + * Count our plugins (but only once) by counting the top level folders in the |
|
134 | + * mu-plugins dir. If it's more or less than last time, update the cache. |
|
135 | + */ |
|
136 | + private function countPlugins() { |
|
137 | 137 | if (isset(self::$count)) { return self::$count; } |
138 | 138 | |
139 | 139 | $count = count(glob(WPMU_PLUGIN_DIR . '/*/', GLOB_ONLYDIR | GLOB_NOSORT)); |
140 | 140 | |
141 | 141 | if (!isset(self::$cache['count']) || $count != self::$cache['count']) { |
142 | - self::$count = $count; |
|
143 | - $this->updateCache(); |
|
142 | + self::$count = $count; |
|
143 | + $this->updateCache(); |
|
144 | 144 | } |
145 | 145 | |
146 | 146 | return self::$count; |
147 | - } |
|
147 | + } |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | new Autoloader(); |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | if (isset(self::$_single)) { return; } |
27 | 27 | |
28 | 28 | self::$_single = $this; // Singleton set. |
29 | - self::$relative_path = '/../' . basename(__DIR__); // Rel path set. |
|
29 | + self::$relative_path = '/../'.basename(__DIR__); // Rel path set. |
|
30 | 30 | |
31 | 31 | if (is_admin()) { |
32 | 32 | add_filter('show_advanced_plugins', array($this, 'showInAdmin'), 0, 2); // Admin only filter. |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | $this->countPlugins(); |
45 | 45 | |
46 | 46 | foreach (self::$cache['plugins'] as $plugin_file => $plugin_info) { |
47 | - include_once(WPMU_PLUGIN_DIR . '/' . $plugin_file); |
|
47 | + include_once(WPMU_PLUGIN_DIR.'/'.$plugin_file); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | $this->pluginHooks(); |
@@ -63,7 +63,7 @@ discard block |
||
63 | 63 | |
64 | 64 | $this->updateCache(); // May as well update the transient cache whilst here. |
65 | 65 | |
66 | - self::$auto_plugins = array_map(function ($auto_plugin) { |
|
66 | + self::$auto_plugins = array_map(function($auto_plugin) { |
|
67 | 67 | $auto_plugin['Name'] .= ' *'; |
68 | 68 | return $auto_plugin; |
69 | 69 | }, self::$auto_plugins); |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | * After that, we can update the cache. |
93 | 93 | */ |
94 | 94 | private function updateCache() { |
95 | - require_once(ABSPATH . 'wp-admin/includes/plugin.php'); |
|
95 | + require_once(ABSPATH.'wp-admin/includes/plugin.php'); |
|
96 | 96 | |
97 | 97 | self::$auto_plugins = get_plugins(self::$relative_path); |
98 | 98 | self::$mu_plugins = get_mu_plugins(self::$relative_path); |
@@ -113,7 +113,7 @@ discard block |
||
113 | 113 | if (!is_array(self::$activated)) { return; } |
114 | 114 | |
115 | 115 | foreach (self::$activated as $plugin_file => $plugin_info) { |
116 | - do_action('activate_' . $plugin_file); |
|
116 | + do_action('activate_'.$plugin_file); |
|
117 | 117 | } |
118 | 118 | } |
119 | 119 | |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | */ |
123 | 123 | private function validatePlugins() { |
124 | 124 | foreach (self::$cache['plugins'] as $plugin_file => $plugin_info) { |
125 | - if (!file_exists(WPMU_PLUGIN_DIR . '/' . $plugin_file)) { |
|
125 | + if (!file_exists(WPMU_PLUGIN_DIR.'/'.$plugin_file)) { |
|
126 | 126 | $this->updateCache(); |
127 | 127 | break; |
128 | 128 | } |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | private function countPlugins() { |
137 | 137 | if (isset(self::$count)) { return self::$count; } |
138 | 138 | |
139 | - $count = count(glob(WPMU_PLUGIN_DIR . '/*/', GLOB_ONLYDIR | GLOB_NOSORT)); |
|
139 | + $count = count(glob(WPMU_PLUGIN_DIR.'/*/', GLOB_ONLYDIR | GLOB_NOSORT)); |
|
140 | 140 | |
141 | 141 | if (!isset(self::$cache['count']) || $count != self::$cache['count']) { |
142 | 142 | self::$count = $count; |
@@ -10,5 +10,5 @@ |
||
10 | 10 | */ |
11 | 11 | |
12 | 12 | if (!defined('WP_DEFAULT_THEME')) { |
13 | - register_theme_directory(ABSPATH . 'wp-content/themes'); |
|
13 | + register_theme_directory(ABSPATH.'wp-content/themes'); |
|
14 | 14 | } |
15 | 15 | \ No newline at end of file |
@@ -8,20 +8,20 @@ |
||
8 | 8 | |
9 | 9 | <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> |
10 | 10 | <header class="entry-header"> |
11 | - <?php the_title( '<h1 class="entry-title">', '</h1>' ); ?> |
|
11 | + <?php the_title('<h1 class="entry-title">', '</h1>'); ?> |
|
12 | 12 | </header><!-- .entry-header --> |
13 | 13 | |
14 | 14 | <div class="entry-content"> |
15 | 15 | <?php the_content(); ?> |
16 | 16 | <?php |
17 | - wp_link_pages( array( |
|
18 | - 'before' => '<div class="page-links">' . __( 'Pages:', 'stash' ), |
|
17 | + wp_link_pages(array( |
|
18 | + 'before' => '<div class="page-links">'.__('Pages:', 'stash'), |
|
19 | 19 | 'after' => '</div>', |
20 | - ) ); |
|
20 | + )); |
|
21 | 21 | ?> |
22 | 22 | </div><!-- .entry-content --> |
23 | 23 | |
24 | 24 | <footer class="entry-footer"> |
25 | - <?php edit_post_link( __( 'Edit', 'stash' ), '<span class="edit-link">', '</span>' ); ?> |
|
25 | + <?php edit_post_link(__('Edit', 'stash'), '<span class="edit-link">', '</span>'); ?> |
|
26 | 26 | </footer><!-- .entry-footer --> |
27 | 27 | </article><!-- #post-## --> |
@@ -16,11 +16,11 @@ |
||
16 | 16 | <div class="entry-content"> |
17 | 17 | <?php the_content(); ?> |
18 | 18 | <?php |
19 | - wp_link_pages( array( |
|
20 | - 'before' => '<div class="page-links">' . __( 'Pages:', 'stash' ), |
|
21 | - 'after' => '</div>', |
|
22 | - ) ); |
|
23 | - ?> |
|
19 | + wp_link_pages( array( |
|
20 | + 'before' => '<div class="page-links">' . __( 'Pages:', 'stash' ), |
|
21 | + 'after' => '</div>', |
|
22 | + ) ); |
|
23 | + ?> |
|
24 | 24 | </div><!-- .entry-content --> |
25 | 25 | |
26 | 26 | <footer class="entry-footer"> |
@@ -6,8 +6,8 @@ discard block |
||
6 | 6 | use Twig_Extension_StringLoader; |
7 | 7 | |
8 | 8 | if (!class_exists('Timber')) { |
9 | - add_action('admin_notices', function () { |
|
10 | - echo '<div class="error"><p>Timber not activated. Make sure you activate the plugin in <a href="' . esc_url(admin_url('plugins.php#timber')) . '">' . esc_url(admin_url('plugins.php')) . '</a></p></div>'; |
|
9 | + add_action('admin_notices', function() { |
|
10 | + echo '<div class="error"><p>Timber not activated. Make sure you activate the plugin in <a href="'.esc_url(admin_url('plugins.php#timber')).'">'.esc_url(admin_url('plugins.php')).'</a></p></div>'; |
|
11 | 11 | }); |
12 | 12 | |
13 | 13 | return; |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | */ |
48 | 48 | function registerPostTypes() |
49 | 49 | { |
50 | - foreach (glob(__DIR__ . "/inc/post-types/*.php") as $filename) { |
|
50 | + foreach (glob(__DIR__."/inc/post-types/*.php") as $filename) { |
|
51 | 51 | include_once $filename; |
52 | 52 | } |
53 | 53 | } |
@@ -115,30 +115,30 @@ discard block |
||
115 | 115 | */ |
116 | 116 | function themeAssets() |
117 | 117 | { |
118 | - $vendorJsExists = file_exists(get_template_directory() . '/dist/js/vendor.js'); |
|
119 | - $mainJsExists = file_exists(get_template_directory() . '/dist/js/main.js'); |
|
118 | + $vendorJsExists = file_exists(get_template_directory().'/dist/js/vendor.js'); |
|
119 | + $mainJsExists = file_exists(get_template_directory().'/dist/js/main.js'); |
|
120 | 120 | $mainJsDependencies = []; |
121 | 121 | |
122 | - $mainCssExists = file_exists(get_template_directory() . '/dist/css/main.css'); |
|
123 | - $vendorCssExists = file_exists(get_template_directory() . '/dist/css/vendor.css'); |
|
122 | + $mainCssExists = file_exists(get_template_directory().'/dist/css/main.css'); |
|
123 | + $vendorCssExists = file_exists(get_template_directory().'/dist/css/vendor.css'); |
|
124 | 124 | $mainCssDependencies = []; |
125 | 125 | |
126 | 126 | if ($vendorJsExists) { |
127 | - wp_enqueue_script('stashVendorJs', get_template_directory_uri() . '/dist/js/vendor.js', [], '1.0.0', true); |
|
127 | + wp_enqueue_script('stashVendorJs', get_template_directory_uri().'/dist/js/vendor.js', [], '1.0.0', true); |
|
128 | 128 | array_push($mainJsDependencies, 'stashVendorJs'); |
129 | 129 | } |
130 | 130 | |
131 | 131 | if ($mainJsExists) { |
132 | - wp_enqueue_script('stashMainJs', get_template_directory_uri() . '/dist/js/main.js', $mainJsDependencies, '1.0.0', true); |
|
132 | + wp_enqueue_script('stashMainJs', get_template_directory_uri().'/dist/js/main.js', $mainJsDependencies, '1.0.0', true); |
|
133 | 133 | } |
134 | 134 | |
135 | 135 | if ($vendorCssExists) { |
136 | - wp_enqueue_style('stashVendorCss', get_template_directory_uri() . '/dist/css/vendor.css', [], '1.0.0'); |
|
136 | + wp_enqueue_style('stashVendorCss', get_template_directory_uri().'/dist/css/vendor.css', [], '1.0.0'); |
|
137 | 137 | array_push($mainCssDependencies, 'stashVendorCss'); |
138 | 138 | } |
139 | 139 | |
140 | 140 | if ($mainCssExists) { |
141 | - wp_enqueue_style('stashMainCss', get_template_directory_uri() . '/dist/css/main.css', $mainCssDependencies, '1.0.0'); |
|
141 | + wp_enqueue_style('stashMainCss', get_template_directory_uri().'/dist/css/main.css', $mainCssDependencies, '1.0.0'); |
|
142 | 142 | } |
143 | 143 | } |
144 | 144 |
@@ -12,4 +12,4 @@ |
||
12 | 12 | $context = Timber::get_context(); |
13 | 13 | $post = new TimberPost(); |
14 | 14 | $context['post'] = $post; |
15 | -Timber::render(array('page-' . $post->post_name . '.twig', 'page.twig'), $context); |
|
16 | 15 | \ No newline at end of file |
16 | +Timber::render(array('page-'.$post->post_name.'.twig', 'page.twig'), $context); |
|
17 | 17 | \ No newline at end of file |
@@ -17,19 +17,19 @@ |
||
17 | 17 | |
18 | 18 | <div class="entry-content"> |
19 | 19 | <?php |
20 | - /* translators: %s: Name of current post */ |
|
21 | - the_content( sprintf( |
|
22 | - __( 'Continue reading %s <span class="meta-nav">→</span>', 'stash' ), |
|
23 | - the_title( '<span class="screen-reader-text">"', '"</span>', false ) |
|
24 | - ) ); |
|
25 | - ?> |
|
20 | + /* translators: %s: Name of current post */ |
|
21 | + the_content( sprintf( |
|
22 | + __( 'Continue reading %s <span class="meta-nav">→</span>', 'stash' ), |
|
23 | + the_title( '<span class="screen-reader-text">"', '"</span>', false ) |
|
24 | + ) ); |
|
25 | + ?> |
|
26 | 26 | |
27 | 27 | <?php |
28 | - wp_link_pages( array( |
|
29 | - 'before' => '<div class="page-links">' . __( 'Pages:', 'stash' ), |
|
30 | - 'after' => '</div>', |
|
31 | - ) ); |
|
32 | - ?> |
|
28 | + wp_link_pages( array( |
|
29 | + 'before' => '<div class="page-links">' . __( 'Pages:', 'stash' ), |
|
30 | + 'after' => '</div>', |
|
31 | + ) ); |
|
32 | + ?> |
|
33 | 33 | </div><!-- .entry-content --> |
34 | 34 | |
35 | 35 | <footer class="entry-footer"> |
@@ -6,9 +6,9 @@ discard block |
||
6 | 6 | |
7 | 7 | <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>> |
8 | 8 | <header class="entry-header"> |
9 | - <?php the_title( sprintf( '<h1 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h1>' ); ?> |
|
9 | + <?php the_title(sprintf('<h1 class="entry-title"><a href="%s" rel="bookmark">', esc_url(get_permalink())), '</a></h1>'); ?> |
|
10 | 10 | |
11 | - <?php if ( 'post' == get_post_type() ) : ?> |
|
11 | + <?php if ('post' == get_post_type()) : ?> |
|
12 | 12 | <div class="entry-meta"> |
13 | 13 | <?php stash_posted_on(); ?> |
14 | 14 | </div><!-- .entry-meta --> |
@@ -18,17 +18,17 @@ discard block |
||
18 | 18 | <div class="entry-content"> |
19 | 19 | <?php |
20 | 20 | /* translators: %s: Name of current post */ |
21 | - the_content( sprintf( |
|
22 | - __( 'Continue reading %s <span class="meta-nav">→</span>', 'stash' ), |
|
23 | - the_title( '<span class="screen-reader-text">"', '"</span>', false ) |
|
24 | - ) ); |
|
21 | + the_content(sprintf( |
|
22 | + __('Continue reading %s <span class="meta-nav">→</span>', 'stash'), |
|
23 | + the_title('<span class="screen-reader-text">"', '"</span>', false) |
|
24 | + )); |
|
25 | 25 | ?> |
26 | 26 | |
27 | 27 | <?php |
28 | - wp_link_pages( array( |
|
29 | - 'before' => '<div class="page-links">' . __( 'Pages:', 'stash' ), |
|
28 | + wp_link_pages(array( |
|
29 | + 'before' => '<div class="page-links">'.__('Pages:', 'stash'), |
|
30 | 30 | 'after' => '</div>', |
31 | - ) ); |
|
31 | + )); |
|
32 | 32 | ?> |
33 | 33 | </div><!-- .entry-content --> |
34 | 34 |
@@ -14,7 +14,7 @@ discard block |
||
14 | 14 | * return early without loading the comments. |
15 | 15 | */ |
16 | 16 | if ( post_password_required() ) { |
17 | - return; |
|
17 | + return; |
|
18 | 18 | } |
19 | 19 | ?> |
20 | 20 | |
@@ -25,9 +25,9 @@ discard block |
||
25 | 25 | <?php if ( have_comments() ) : ?> |
26 | 26 | <h2 class="comments-title"> |
27 | 27 | <?php |
28 | - printf( _nx( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'comments title', 'stash' ), |
|
29 | - number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' ); |
|
30 | - ?> |
|
28 | + printf( _nx( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'comments title', 'stash' ), |
|
29 | + number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' ); |
|
30 | + ?> |
|
31 | 31 | </h2> |
32 | 32 | |
33 | 33 | <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> |
@@ -44,11 +44,11 @@ discard block |
||
44 | 44 | |
45 | 45 | <ol class="comment-list"> |
46 | 46 | <?php |
47 | - wp_list_comments( array( |
|
48 | - 'style' => 'ol', |
|
49 | - 'short_ping' => true, |
|
50 | - ) ); |
|
51 | - ?> |
|
47 | + wp_list_comments( array( |
|
48 | + 'style' => 'ol', |
|
49 | + 'short_ping' => true, |
|
50 | + ) ); |
|
51 | + ?> |
|
52 | 52 | </ol><!-- .comment-list --> |
53 | 53 | |
54 | 54 | <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> |
@@ -66,9 +66,9 @@ discard block |
||
66 | 66 | <?php endif; // have_comments() ?> |
67 | 67 | |
68 | 68 | <?php |
69 | - // If comments are closed and there are comments, let's leave a little note, shall we? |
|
70 | - if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : |
|
71 | - ?> |
|
69 | + // If comments are closed and there are comments, let's leave a little note, shall we? |
|
70 | + if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : |
|
71 | + ?> |
|
72 | 72 | <p class="no-comments"><?php _e( 'Comments are closed.', 'stash' ); ?></p> |
73 | 73 | <?php endif; ?> |
74 | 74 |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | * the visitor has not yet entered the password we will |
14 | 14 | * return early without loading the comments. |
15 | 15 | */ |
16 | -if ( post_password_required() ) { |
|
16 | +if (post_password_required()) { |
|
17 | 17 | return; |
18 | 18 | } |
19 | 19 | ?> |
@@ -22,21 +22,21 @@ discard block |
||
22 | 22 | |
23 | 23 | <?php // You can start editing here -- including this comment! ?> |
24 | 24 | |
25 | - <?php if ( have_comments() ) : ?> |
|
25 | + <?php if (have_comments()) : ?> |
|
26 | 26 | <h2 class="comments-title"> |
27 | 27 | <?php |
28 | - printf( _nx( 'One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'comments title', 'stash' ), |
|
29 | - number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' ); |
|
28 | + printf(_nx('One thought on “%2$s”', '%1$s thoughts on “%2$s”', get_comments_number(), 'comments title', 'stash'), |
|
29 | + number_format_i18n(get_comments_number()), '<span>'.get_the_title().'</span>'); |
|
30 | 30 | ?> |
31 | 31 | </h2> |
32 | 32 | |
33 | - <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> |
|
33 | + <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?> |
|
34 | 34 | <nav id="comment-nav-above" class="navigation comment-navigation" role="navigation"> |
35 | - <h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'stash' ); ?></h2> |
|
35 | + <h2 class="screen-reader-text"><?php _e('Comment navigation', 'stash'); ?></h2> |
|
36 | 36 | <div class="nav-links"> |
37 | 37 | |
38 | - <div class="nav-previous"><?php previous_comments_link( __( 'Older Comments', 'stash' ) ); ?></div> |
|
39 | - <div class="nav-next"><?php next_comments_link( __( 'Newer Comments', 'stash' ) ); ?></div> |
|
38 | + <div class="nav-previous"><?php previous_comments_link(__('Older Comments', 'stash')); ?></div> |
|
39 | + <div class="nav-next"><?php next_comments_link(__('Newer Comments', 'stash')); ?></div> |
|
40 | 40 | |
41 | 41 | </div><!-- .nav-links --> |
42 | 42 | </nav><!-- #comment-nav-above --> |
@@ -44,20 +44,20 @@ discard block |
||
44 | 44 | |
45 | 45 | <ol class="comment-list"> |
46 | 46 | <?php |
47 | - wp_list_comments( array( |
|
47 | + wp_list_comments(array( |
|
48 | 48 | 'style' => 'ol', |
49 | 49 | 'short_ping' => true, |
50 | - ) ); |
|
50 | + )); |
|
51 | 51 | ?> |
52 | 52 | </ol><!-- .comment-list --> |
53 | 53 | |
54 | - <?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?> |
|
54 | + <?php if (get_comment_pages_count() > 1 && get_option('page_comments')) : // are there comments to navigate through ?> |
|
55 | 55 | <nav id="comment-nav-below" class="navigation comment-navigation" role="navigation"> |
56 | - <h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'stash' ); ?></h2> |
|
56 | + <h2 class="screen-reader-text"><?php _e('Comment navigation', 'stash'); ?></h2> |
|
57 | 57 | <div class="nav-links"> |
58 | 58 | |
59 | - <div class="nav-previous"><?php previous_comments_link( __( 'Older Comments', 'stash' ) ); ?></div> |
|
60 | - <div class="nav-next"><?php next_comments_link( __( 'Newer Comments', 'stash' ) ); ?></div> |
|
59 | + <div class="nav-previous"><?php previous_comments_link(__('Older Comments', 'stash')); ?></div> |
|
60 | + <div class="nav-next"><?php next_comments_link(__('Newer Comments', 'stash')); ?></div> |
|
61 | 61 | |
62 | 62 | </div><!-- .nav-links --> |
63 | 63 | </nav><!-- #comment-nav-below --> |
@@ -67,9 +67,9 @@ discard block |
||
67 | 67 | |
68 | 68 | <?php |
69 | 69 | // If comments are closed and there are comments, let's leave a little note, shall we? |
70 | - if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : |
|
70 | + if (!comments_open() && '0' != get_comments_number() && post_type_supports(get_post_type(), 'comments')) : |
|
71 | 71 | ?> |
72 | - <p class="no-comments"><?php _e( 'Comments are closed.', 'stash' ); ?></p> |
|
72 | + <p class="no-comments"><?php _e('Comments are closed.', 'stash'); ?></p> |
|
73 | 73 | <?php endif; ?> |
74 | 74 | |
75 | 75 | <?php comment_form(); ?> |
@@ -11,11 +11,11 @@ |
||
11 | 11 | */ |
12 | 12 | function get($name) |
13 | 13 | { |
14 | - return get_template_directory_uri() . '/dist/images/' . $name; |
|
14 | + return get_template_directory_uri().'/dist/images/'.$name; |
|
15 | 15 | } |
16 | 16 | |
17 | 17 | function display($name) |
18 | 18 | { |
19 | - return "<img src='" . $this->get($name) . "' />"; |
|
19 | + return "<img src='".$this->get($name)."' />"; |
|
20 | 20 | } |
21 | 21 | } |
22 | 22 | \ No newline at end of file |
@@ -19,14 +19,14 @@ |
||
19 | 19 | 'name' => _x($plural, 'Post Type General Name', 'stash'), |
20 | 20 | 'singular_name' => _x($single, 'Post Type Singular Name', 'stash'), |
21 | 21 | 'menu_name' => __($plural, 'stash'), |
22 | - 'parent_item_colon' => __('Parent ' . $single . ':', 'stash'), |
|
23 | - 'all_items' => __('All ' . $plural, 'stash'), |
|
24 | - 'view_item' => __('View ' . $single, 'stash'), |
|
25 | - 'add_new_item' => __('Add New ' . $single, 'stash'), |
|
22 | + 'parent_item_colon' => __('Parent '.$single.':', 'stash'), |
|
23 | + 'all_items' => __('All '.$plural, 'stash'), |
|
24 | + 'view_item' => __('View '.$single, 'stash'), |
|
25 | + 'add_new_item' => __('Add New '.$single, 'stash'), |
|
26 | 26 | 'add_new' => __('Add New', 'stash'), |
27 | - 'edit_item' => __('Edit ' . $single, 'stash'), |
|
28 | - 'update_item' => __('Update ' . $single, 'stash'), |
|
29 | - 'search_items' => __('Search ' . $single, 'stash'), |
|
27 | + 'edit_item' => __('Edit '.$single, 'stash'), |
|
28 | + 'update_item' => __('Update '.$single, 'stash'), |
|
29 | + 'search_items' => __('Search '.$single, 'stash'), |
|
30 | 30 | 'not_found' => __('Not found', 'stash'), |
31 | 31 | 'not_found_in_trash' => __('Not found in Trash', 'stash'), |
32 | 32 | ], |