Changeset 1630555

Timestamp:

04/05/2017 10:00:39 PM (9 years ago)

Author:

codeofconduct

Message:

• Fix: Simply Static should now display a useful error message when using PHP <5.3

Location:

simply-static/trunk

Files:

• includes/class-ss-plugin.php (modified) (2 diffs)
• includes/load.php (added)
• includes/shims.php (modified) (1 diff)
• languages/simply-static.pot (modified) (2 diffs)
• readme.txt (modified) (2 diffs)
• simply-static.php (modified) (2 diffs)

simply-static/trunk/includes/class-ss-plugin.php

@@ -15 +15 @@
      * @var string
      */
-    const VERSION = '2.0.5';
+    const VERSION = '2.0.6';
 
     /**
@@ -122 +122 @@
      */
     private function includes() {
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/shims.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/libraries/phpuri.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/libraries/PhpSimple/HtmlDomParser.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/libraries/wp-background-processing/wp-background-processing.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-options.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-view.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-url-extractor.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-url-fetcher.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-archive-creation-job.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/tasks/class-ss-task.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/tasks/class-ss-setup-task.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/tasks/class-ss-fetch-urls-task.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/tasks/class-ss-transfer-files-locally-task.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/tasks/class-ss-create-zip-archive.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/tasks/class-ss-wrapup-task.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/tasks/class-ss-cancel-task.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-query.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/models/class-ss-model.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/models/class-ss-page.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-diagnostic.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-sql-permissions.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-upgrade-handler.php';
-        require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-ss-util.php';
+        $path = plugin_dir_path( dirname( __FILE__ ) );
+        require_once $path . 'includes/shims.php';
+        require_once $path . 'includes/libraries/phpuri.php';
+        require_once $path . 'includes/libraries/PhpSimple/HtmlDomParser.php';
+        require_once $path . 'includes/libraries/wp-background-processing/wp-background-processing.php';
+        require_once $path . 'includes/class-ss-options.php';
+        require_once $path . 'includes/class-ss-view.php';
+        require_once $path . 'includes/class-ss-url-extractor.php';
+        require_once $path . 'includes/class-ss-url-fetcher.php';
+        require_once $path . 'includes/class-ss-archive-creation-job.php';
+        require_once $path . 'includes/tasks/class-ss-task.php';
+        require_once $path . 'includes/tasks/class-ss-setup-task.php';
+        require_once $path . 'includes/tasks/class-ss-fetch-urls-task.php';
+        require_once $path . 'includes/tasks/class-ss-transfer-files-locally-task.php';
+        require_once $path . 'includes/tasks/class-ss-create-zip-archive.php';
+        require_once $path . 'includes/tasks/class-ss-wrapup-task.php';
+        require_once $path . 'includes/tasks/class-ss-cancel-task.php';
+        require_once $path . 'includes/class-ss-query.php';
+        require_once $path . 'includes/models/class-ss-model.php';
+        require_once $path . 'includes/models/class-ss-page.php';
+        require_once $path . 'includes/class-ss-diagnostic.php';
+        require_once $path . 'includes/class-ss-sql-permissions.php';
+        require_once $path . 'includes/class-ss-upgrade-handler.php';
+        require_once $path . 'includes/class-ss-util.php';
     }
 

simply-static/trunk/includes/shims.php

@@ -1 +1 @@
 <?php
+// Exit if accessed directly
+if ( ! defined( 'ABSPATH' ) ) {
+    exit;
+}
 
 /**

simply-static/trunk/languages/simply-static.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Simply Static 2.0.5\n"
+"Project-Id-Version: Simply Static 2.0.6\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/simply-static\n"
-"POT-Creation-Date: 2017-03-26 04:05:51+00:00\n"
+"POT-Creation-Date: 2017-04-05 21:58:06+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -138 +138 @@
 msgstr ""
 
-#: includes/class-ss-plugin.php:191
+#: includes/class-ss-plugin.php:192
 msgid "Generate Static Site"
 msgstr ""
 
-#: includes/class-ss-plugin.php:192
+#: includes/class-ss-plugin.php:193
 msgid "Generate"
 msgstr ""
 
-#: includes/class-ss-plugin.php:200
+#: includes/class-ss-plugin.php:201
 msgid "Simply Static Settings"
 msgstr ""
 
-#: includes/class-ss-plugin.php:201
+#: includes/class-ss-plugin.php:202
 msgid "Settings"
 msgstr ""
 
-#: includes/class-ss-plugin.php:209
+#: includes/class-ss-plugin.php:210
 msgid "Simply Static Diagnostics"
 msgstr ""
 
-#: includes/class-ss-plugin.php:210
+#: includes/class-ss-plugin.php:211
 msgid "Diagnostics"
 msgstr ""
 
-#: includes/class-ss-plugin.php:224 includes/class-ss-plugin.php:269
-#: includes/class-ss-plugin.php:292 includes/class-ss-plugin.php:721
+#: includes/class-ss-plugin.php:225 includes/class-ss-plugin.php:270
+#: includes/class-ss-plugin.php:293 includes/class-ss-plugin.php:722
 msgid "Not permitted"
 msgstr ""
 
-#: includes/class-ss-plugin.php:423 includes/class-ss-plugin.php:476
+#: includes/class-ss-plugin.php:424 includes/class-ss-plugin.php:477
 msgid "Your changes have been saved."
 msgstr ""
 
-#: includes/class-ss-plugin.php:495
+#: includes/class-ss-plugin.php:496
 msgid "Unable to create a ZIP of the debug log."
 msgstr ""
 
-#: includes/class-ss-plugin.php:503
+#: includes/class-ss-plugin.php:504
 msgid "Debug log successfully sent to: %s"
 msgstr ""
 
-#: includes/class-ss-plugin.php:506
+#: includes/class-ss-plugin.php:507
 msgid "We encountered an error when attempting to send out the debug log."
 msgstr ""
 
-#: includes/class-ss-plugin.php:637
+#: includes/class-ss-plugin.php:638
 msgid "Plugin reset complete."
 msgstr ""
 
-#: includes/class-ss-plugin.php:671
+#: includes/class-ss-plugin.php:672
 msgid "Contact Support"
 msgstr ""
 
-#: includes/class-ss-plugin.php:675
+#: includes/class-ss-plugin.php:676
 msgid "Enjoying Simply Static? Add your [stars] on wordpress.org."
 msgstr ""
 
-#: includes/class-ss-plugin.php:690
+#: includes/class-ss-plugin.php:691
 msgid "Simply Static Version"
 msgstr ""
 
-#: includes/class-ss-plugin.php:690
+#: includes/class-ss-plugin.php:691
 msgid "View what changed in this version"
 msgstr ""

simply-static/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 4.0
 Tested up to: 4.7
-Stable tag: 2.0.5
+Stable tag: 2.0.6
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -102 +102 @@
 
 == Changelog ==
+
+= 2.0.6, April 4, 2017 =
+
+* Fix: Simply Static should now display a useful error message when using PHP <5.3
 
 = 2.0.5, March 25, 2017 =

simply-static/trunk/simply-static.php

@@ -9 +9 @@
  * Plugin URI:        http://codeofconduct.co/simply-static
  * Description:       Produces a static HTML version of your WordPress install and adjusts URLs accordingly.
- * Version:           2.0.5
+ * Version:           2.0.6
  * Author:            Code of Conduct LLC
  * Author URI:        http://codeofconduct.co/
@@ -34 +34 @@
     }
 } else {
-    require_once plugin_dir_path( __FILE__ ) . 'includes/class-ss-plugin.php';
-
-    Simply_Static\Plugin::instance();
+    // Loading up Simply Static in a separate file so that there's nothing to
+    // trigger a PHP error in this file (e.g. by using namespacing)
+    require_once plugin_dir_path( __FILE__ ) . 'includes/load.php';
 }