Completed
Branch master (c6a90a)
by
unknown
07:39 queued 05:31
created
admin_pages/about/templates/whats_new.template.php 2 patches
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -17,47 +17,47 @@  discard block
 block discarded – undo
17 17
     </h3>
18 18
     <p>
19 19
         <?php
20
-        echo printf(
21
-            esc_html__('%3$sVersion %1$s%4$s is a %2$s bug fix/enhancement release.', 'event_espresso'),
22
-            EVENT_ESPRESSO_VERSION,
23
-            $type,
24
-            '<strong>',
25
-            '</strong>'
26
-        );
27
-        printf(
28
-            esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
29
-            '<a href="https://eventespresso.com/wiki/ee4-changelog/#' . $version . '">',
30
-            '</a>'
31
-        );
32
-        ?>
20
+		echo printf(
21
+			esc_html__('%3$sVersion %1$s%4$s is a %2$s bug fix/enhancement release.', 'event_espresso'),
22
+			EVENT_ESPRESSO_VERSION,
23
+			$type,
24
+			'<strong>',
25
+			'</strong>'
26
+		);
27
+		printf(
28
+			esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
29
+			'<a href="https://eventespresso.com/wiki/ee4-changelog/#' . $version . '">',
30
+			'</a>'
31
+		);
32
+		?>
33 33
     </p>
34 34
 </div>
35 35
 
36 36
 <div class="changelog">
37 37
     <?php
38
-    // maintenance mode on?
39
-    if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
40
-        ?>
38
+	// maintenance mode on?
39
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
40
+		?>
41 41
         <div class="ee-attention">
42 42
             <h2 class="ee-maintenance-mode-callout">
43 43
                 <?php esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?>
44 44
             </h2>
45 45
             <p>
46 46
                 <?php
47
-                printf(
48
-                    esc_html__(
49
-                        'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
50
-                        'event_espresso'
51
-                    ),
52
-                    '<a href="admin.php?page=espresso_maintenance_settings">',
53
-                    '</a>'
54
-                );
55
-                ?>
47
+				printf(
48
+					esc_html__(
49
+						'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %sEvent Espresso Maintenance%s page.',
50
+						'event_espresso'
51
+					),
52
+					'<a href="admin.php?page=espresso_maintenance_settings">',
53
+					'</a>'
54
+				);
55
+				?>
56 56
             </p>
57 57
         </div>
58 58
         <?php
59
-    }
60
-    ?>
59
+	}
60
+	?>
61 61
 
62 62
     <h2 class="about-headline-callout">Initial EE4 Decaf (free) Release</h2>
63 63
     <p>This is the initial release of EE4 Decaf. This is the free version of our very powerful event registration and
@@ -92,8 +92,8 @@  discard block
 block discarded – undo
92 92
 
93 93
     <p>
94 94
         <a href="<?php echo esc_url_raw(
95
-            EE_GLOBAL_ASSETS_URL . 'images/banners/ticket-bundles-533x562.png'
96
-        ); ?>">
95
+			EE_GLOBAL_ASSETS_URL . 'images/banners/ticket-bundles-533x562.png'
96
+		); ?>">
97 97
             <strong>Support for “Ticket Bundles” &amp; “Graduated Pricing”</strong>
98 98
         </a>
99 99
         <br>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
         );
27 27
         printf(
28 28
             esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
29
-            '<a href="https://eventespresso.com/wiki/ee4-changelog/#' . $version . '">',
29
+            '<a href="https://eventespresso.com/wiki/ee4-changelog/#'.$version.'">',
30 30
             '</a>'
31 31
         );
32 32
         ?>
@@ -92,7 +92,7 @@  discard block
 block discarded – undo
92 92
 
93 93
     <p>
94 94
         <a href="<?php echo esc_url_raw(
95
-            EE_GLOBAL_ASSETS_URL . 'images/banners/ticket-bundles-533x562.png'
95
+            EE_GLOBAL_ASSETS_URL.'images/banners/ticket-bundles-533x562.png'
96 96
         ); ?>">
97 97
             <strong>Support for “Ticket Bundles” &amp; “Graduated Pricing”</strong>
98 98
         </a>
Please login to merge, or discard this patch.
caffeinated/admin/extend/about/templates/whats_new.template.php 2 patches
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@  discard block
 block discarded – undo
3 3
 $is_major_release = true;
4 4
 $type             = $is_major_release ? 'major' : 'minor';
5 5
 $heading          = $is_major_release
6
-    ? _n('Major Release Information', 'Major Releases', 1, 'event_espresso')
7
-    : _n('Minor Release Information', 'Minor Releases', 1, 'event_espresso');
6
+	? _n('Major Release Information', 'Major Releases', 1, 'event_espresso')
7
+	: _n('Minor Release Information', 'Minor Releases', 1, 'event_espresso');
8 8
 
9 9
 $version = explode('.', EVENT_ESPRESSO_VERSION);
10 10
 array_pop($version);
@@ -14,48 +14,48 @@  discard block
 block discarded – undo
14 14
 <div class="changelog point-releases">
15 15
     <h3><?php echo esc_html($heading); ?></h3>
16 16
     <p><?php
17
-        printf(
18
-            esc_html__('%1$sVersion %2$s%3$s is a %4$s release.', 'event_espresso'),
19
-            '<strong>',
20
-            EVENT_ESPRESSO_VERSION,
21
-            '</strong>',
22
-            $type
23
-        ); ?>
17
+		printf(
18
+			esc_html__('%1$sVersion %2$s%3$s is a %4$s release.', 'event_espresso'),
19
+			'<strong>',
20
+			EVENT_ESPRESSO_VERSION,
21
+			'</strong>',
22
+			$type
23
+		); ?>
24 24
         <?php printf(
25
-            esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
26
-            '<a href="https://eventespresso.com/wiki/ee4-changelog/#'
27
-            . $version
28
-            . '" target="_blank" rel="noopener noreferrer">',
29
-            '</a>'
30
-        ); ?>
25
+			esc_html__('For more information, see %1$sthe release notes%2$s.', 'event_espresso'),
26
+			'<a href="https://eventespresso.com/wiki/ee4-changelog/#'
27
+			. $version
28
+			. '" target="_blank" rel="noopener noreferrer">',
29
+			'</a>'
30
+		); ?>
31 31
     </p>
32 32
 </div><!-- end .changelog .point-releases -->
33 33
 
34 34
 <div class="changelog">
35 35
     <?php
36
-    // maintenance mode on?
37
-    if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
38
-        ?>
36
+	// maintenance mode on?
37
+	if (EE_Maintenance_Mode::instance()->level() == EE_Maintenance_Mode::level_2_complete_maintenance) {
38
+		?>
39 39
         <div class="ee-attention">
40 40
             <h2 class="ee-maintenance-mode-callout">
41 41
                 <?php esc_html_e('Event Espresso is in full maintenance mode.', 'event_espresso'); ?>
42 42
             </h2>
43 43
             <p>
44 44
                 <?php
45
-                printf(
46
-                    esc_html__(
47
-                        'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %1$sEvent Espresso Maintenance%2$s page.',
48
-                        'event_espresso'
49
-                    ),
50
-                    '<a href="admin.php?page=espresso_maintenance_settings">',
51
-                    '</a>'
52
-                );
53
-                ?>
45
+				printf(
46
+					esc_html__(
47
+						'A previous version of Event Espresso has detected. But before anything else can happen, we need to know whether or not to migrate (copy over) your existing event data so that it can be utilized by EE4. For more instructions on what to do, please visit the %1$sEvent Espresso Maintenance%2$s page.',
48
+						'event_espresso'
49
+					),
50
+					'<a href="admin.php?page=espresso_maintenance_settings">',
51
+					'</a>'
52
+				);
53
+				?>
54 54
             </p>
55 55
         </div>
56 56
         <?php
57
-    }
58
-    ?>
57
+	}
58
+	?>
59 59
 
60 60
     <h2 class="about-headline-callout">Updates &amp; Fixes in EE 4.10</h2>
61 61
     <p class="ee-highlight ee-highlight--info">This release brought many background updates and improvements to
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
     <div class='ee-new-features ee-card-grid ee-card-grid-3-cols'>
68 68
 
69 69
     <?php
70
-    /*
70
+	/*
71 71
         WANT TO ADD A FEW FEATURE?
72 72
         COPY THE FOLLOWING:
73 73
 
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
         ADD "ee-grid-row-span-3" TO THE "ee-card ee-new-feature-card" ex:
100 100
         <div class='ee-card ee-new-feature-card ee-grid-row-span-3'>
101 101
     */
102
-    ?>
102
+	?>
103 103
 
104 104
         <div class='ee-card ee-new-feature-card'>
105 105
             <h4>Attendee Block for WordPress 5 Gutenberg</h4>
@@ -225,8 +225,8 @@  discard block
 block discarded – undo
225 225
                      alt="Wait List Manager Add-on"
226 226
                      class="alignright"
227 227
                      src="<?php echo esc_url_raw(
228
-                         EE_GLOBAL_ASSETS_URL . 'images/banners/ee4-wait-list-manager-380x250.jpeg'
229
-                     ); ?>"
228
+						 EE_GLOBAL_ASSETS_URL . 'images/banners/ee4-wait-list-manager-380x250.jpeg'
229
+					 ); ?>"
230 230
                      width="380"
231 231
                      height="250"
232 232
                 />
@@ -279,8 +279,8 @@  discard block
 block discarded – undo
279 279
                  class="alignright "
280 280
                  alt="PayPal Express Checkout Smart Payment Buttons (with Venmo) Payment Gateway"
281 281
                  src="<?php echo esc_url_raw(
282
-                     EE_GLOBAL_ASSETS_URL . 'images/banners/event-registrations-with-paypal-express-checkout-smart-payment-buttons-380x250.jpeg'
283
-                 ); ?>"
282
+					 EE_GLOBAL_ASSETS_URL . 'images/banners/event-registrations-with-paypal-express-checkout-smart-payment-buttons-380x250.jpeg'
283
+				 ); ?>"
284 284
                  width="260"
285 285
                  height="202"
286 286
             />
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
                      alt="Wait List Manager Add-on"
226 226
                      class="alignright"
227 227
                      src="<?php echo esc_url_raw(
228
-                         EE_GLOBAL_ASSETS_URL . 'images/banners/ee4-wait-list-manager-380x250.jpeg'
228
+                         EE_GLOBAL_ASSETS_URL.'images/banners/ee4-wait-list-manager-380x250.jpeg'
229 229
                      ); ?>"
230 230
                      width="380"
231 231
                      height="250"
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
                  class="alignright "
280 280
                  alt="PayPal Express Checkout Smart Payment Buttons (with Venmo) Payment Gateway"
281 281
                  src="<?php echo esc_url_raw(
282
-                     EE_GLOBAL_ASSETS_URL . 'images/banners/event-registrations-with-paypal-express-checkout-smart-payment-buttons-380x250.jpeg'
282
+                     EE_GLOBAL_ASSETS_URL.'images/banners/event-registrations-with-paypal-express-checkout-smart-payment-buttons-380x250.jpeg'
283 283
                  ); ?>"
284 284
                  width="260"
285 285
                  height="202"
Please login to merge, or discard this patch.
espresso.php 1 patch
Indentation   +80 added lines, -80 removed lines patch added patch discarded remove patch
@@ -38,103 +38,103 @@
 block discarded – undo
38 38
  * @since           4.0
39 39
  */
40 40
 if (function_exists('espresso_version')) {
41
-    if (! function_exists('espresso_duplicate_plugin_error')) {
42
-        /**
43
-         *    espresso_duplicate_plugin_error
44
-         *    displays if more than one version of EE is activated at the same time
45
-         */
46
-        function espresso_duplicate_plugin_error()
47
-        {
48
-            ?>
41
+	if (! function_exists('espresso_duplicate_plugin_error')) {
42
+		/**
43
+		 *    espresso_duplicate_plugin_error
44
+		 *    displays if more than one version of EE is activated at the same time
45
+		 */
46
+		function espresso_duplicate_plugin_error()
47
+		{
48
+			?>
49 49
             <div class="error">
50 50
                 <p>
51 51
                     <?php
52
-                    echo esc_html__(
53
-                        'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
54
-                        'event_espresso'
55
-                    ); ?>
52
+					echo esc_html__(
53
+						'Can not run multiple versions of Event Espresso! One version has been automatically deactivated. Please verify that you have the correct version you want still active.',
54
+						'event_espresso'
55
+					); ?>
56 56
                 </p>
57 57
             </div>
58 58
             <?php
59
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
60
-        }
61
-    }
62
-    add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
59
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
60
+		}
61
+	}
62
+	add_action('admin_notices', 'espresso_duplicate_plugin_error', 1);
63 63
 } else {
64
-    define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
65
-    if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
66
-        /**
67
-         * espresso_minimum_php_version_error
68
-         *
69
-         * @return void
70
-         */
71
-        function espresso_minimum_php_version_error()
72
-        {
73
-            ?>
64
+	define('EE_MIN_PHP_VER_REQUIRED', '5.6.2');
65
+	if (! version_compare(PHP_VERSION, EE_MIN_PHP_VER_REQUIRED, '>=')) {
66
+		/**
67
+		 * espresso_minimum_php_version_error
68
+		 *
69
+		 * @return void
70
+		 */
71
+		function espresso_minimum_php_version_error()
72
+		{
73
+			?>
74 74
             <div class="error">
75 75
                 <p>
76 76
                     <?php
77
-                    printf(
78
-                        esc_html__(
79
-                            'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
80
-                            'event_espresso'
81
-                        ),
82
-                        EE_MIN_PHP_VER_REQUIRED,
83
-                        PHP_VERSION,
84
-                        '<br/>',
85
-                        '<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
86
-                    );
87
-                    ?>
77
+					printf(
78
+						esc_html__(
79
+							'We\'re sorry, but Event Espresso requires PHP version %1$s or greater in order to operate. You are currently running version %2$s.%3$sIn order to update your version of PHP, you will need to contact your current hosting provider.%3$sFor information on stable PHP versions, please go to %4$s.',
80
+							'event_espresso'
81
+						),
82
+						EE_MIN_PHP_VER_REQUIRED,
83
+						PHP_VERSION,
84
+						'<br/>',
85
+						'<a href="http://php.net/downloads.php">http://php.net/downloads.php</a>'
86
+					);
87
+					?>
88 88
                 </p>
89 89
             </div>
90 90
             <?php
91
-            espresso_deactivate_plugin(plugin_basename(__FILE__));
92
-        }
91
+			espresso_deactivate_plugin(plugin_basename(__FILE__));
92
+		}
93 93
 
94
-        add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
95
-    } else {
96
-        define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
97
-        /**
98
-         * espresso_version
99
-         * Returns the plugin version
100
-         *
101
-         * @return string
102
-         */
103
-        function espresso_version()
104
-        {
105
-            return apply_filters('FHEE__espresso__espresso_version', '4.10.39.rc.007');
106
-        }
94
+		add_action('admin_notices', 'espresso_minimum_php_version_error', 1);
95
+	} else {
96
+		define('EVENT_ESPRESSO_MAIN_FILE', __FILE__);
97
+		/**
98
+		 * espresso_version
99
+		 * Returns the plugin version
100
+		 *
101
+		 * @return string
102
+		 */
103
+		function espresso_version()
104
+		{
105
+			return apply_filters('FHEE__espresso__espresso_version', '4.10.39.rc.007');
106
+		}
107 107
 
108
-        /**
109
-         * espresso_plugin_activation
110
-         * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
111
-         */
112
-        function espresso_plugin_activation()
113
-        {
114
-            update_option('ee_espresso_activation', true);
115
-        }
108
+		/**
109
+		 * espresso_plugin_activation
110
+		 * adds a wp-option to indicate that EE has been activated via the WP admin plugins page
111
+		 */
112
+		function espresso_plugin_activation()
113
+		{
114
+			update_option('ee_espresso_activation', true);
115
+		}
116 116
 
117
-        register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
117
+		register_activation_hook(EVENT_ESPRESSO_MAIN_FILE, 'espresso_plugin_activation');
118 118
 
119
-        require_once __DIR__ . '/core/bootstrap_espresso.php';
120
-        bootstrap_espresso();
121
-    }
119
+		require_once __DIR__ . '/core/bootstrap_espresso.php';
120
+		bootstrap_espresso();
121
+	}
122 122
 }
123 123
 if (! function_exists('espresso_deactivate_plugin')) {
124
-    /**
125
-     *    deactivate_plugin
126
-     * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
127
-     *
128
-     * @access public
129
-     * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
130
-     * @return    void
131
-     */
132
-    function espresso_deactivate_plugin($plugin_basename = '')
133
-    {
134
-        if (! function_exists('deactivate_plugins')) {
135
-            require_once ABSPATH . 'wp-admin/includes/plugin.php';
136
-        }
137
-        unset($_GET['activate'], $_REQUEST['activate']);
138
-        deactivate_plugins($plugin_basename);
139
-    }
124
+	/**
125
+	 *    deactivate_plugin
126
+	 * usage:  espresso_deactivate_plugin( plugin_basename( __FILE__ ));
127
+	 *
128
+	 * @access public
129
+	 * @param string $plugin_basename - the results of plugin_basename( __FILE__ ) for the plugin's main file
130
+	 * @return    void
131
+	 */
132
+	function espresso_deactivate_plugin($plugin_basename = '')
133
+	{
134
+		if (! function_exists('deactivate_plugins')) {
135
+			require_once ABSPATH . 'wp-admin/includes/plugin.php';
136
+		}
137
+		unset($_GET['activate'], $_REQUEST['activate']);
138
+		deactivate_plugins($plugin_basename);
139
+	}
140 140
 }
141 141
\ No newline at end of file
Please login to merge, or discard this patch.