Changeset 2814633

Timestamp:

11/08/2022 07:30:45 PM (3 years ago)

Author:

bilaltas

Message:

Release 2.3.2

Location:

custom-codes/trunk

Files:

• composer.json (modified) (1 diff)
• custom-codes.php (modified) (2 diffs)
• languages/custom-codes-tr_TR.mo (modified) (previous)
• languages/custom-codes-tr_TR.po (modified) (3 diffs)
• languages/custom-codes.pot (modified) (4 diffs)
• lib/upgrade.php (modified) (1 diff)
• readme.txt (modified) (1 diff)

custom-codes/trunk/composer.json

@@ -17 +17 @@
       "fix": [
         "phpcbf --extensions=php --ignore=./vendor,./freemius,./node_modules ./lib"
+      ],
+      "lang-update": [
+        "wp-env run cli wp i18n make-pot wp-content/plugins/custom-codes/ wp-content/plugins/custom-codes/languages/custom-codes.pot --exclude='wp-content/plugins/custom-codes/assets, wp-content/plugins/custom-codes/node_modules, wp-content/plugins/custom-codes/vendor'"
+      ],
+      "prepare": [
+        "cp -rf ./ ~/Desktop/custom-codes",
+        "git -C ~/Desktop/custom-codes clean -dfx",
+        "rm -rf ~/Desktop/custom-codes/.git",
+        "cd ~/Desktop/custom-codes/ && zip -r -X ~/Desktop/custom-codes.zip ./"
       ]
     }

custom-codes/trunk/custom-codes.php

@@ -17 +17 @@
  * Text Domain: custom-codes
  * Domain Path: /languages
- * Version: 2.3.1
+ * Version: 2.3.2
  *
  */
 defined( 'ABSPATH' ) || die( 'No script kiddies please!' );
-define( 'CODES_VERSION', '2.3.1' );
+define( 'CODES_VERSION', '2.3.2' );
 define( 'CODES_DEBUG', false );
 // Paths.
@@ -27 +27 @@
 define( 'CODES_PLUGIN_DIR', dirname( CODES_FILE ) );
 define( 'CODES_PLUGIN_URL', plugin_dir_url( CODES_FILE ) );
-define( 'CODES_FOLDER_DIR', WP_CONTENT_DIR . '/custom_codes/' );
-define( 'CODES_FOLDER_URL', str_replace( array( 'http:', 'https:' ), '', WP_CONTENT_URL ) . '/custom_codes/' );
+define( 'CODES_FOLDER_PATH', '/custom_codes/' . (( is_multisite() ? 'site-' . get_current_blog_id() . '/' : '' )) );
+define( 'CODES_FOLDER_DIR', WP_CONTENT_DIR . CODES_FOLDER_PATH );
+define( 'CODES_FOLDER_URL', str_replace( array( 'http:', 'https:' ), '', WP_CONTENT_URL ) . CODES_FOLDER_PATH );
 // Freemius SDK.
 

custom-codes/trunk/languages/custom-codes-tr_TR.po

@@ -5 +5 @@
 "Project-Id-Version: PressX - Custom Codes 2.0\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/custom-codes\n"
-"POT-Creation-Date: 2022-11-05T00:05:51+00:00\n"
-"PO-Revision-Date: 2022-11-05 03:10+0300\n"
+"POT-Creation-Date: 2022-11-08T19:02:47+00:00\n"
+"PO-Revision-Date: 2022-11-08 22:04+0300\n"
 "Last-Translator: Bilal Tas <[email protected]>\n"
 "Language-Team: \n"
@@ -38 +38 @@
 
 #. translators: 1: WP Filesystem Method
-#: custom-codes.php:111
+#: custom-codes.php:112
 msgid ""
 "Your WordPress filesystem method \"%1$s\" is not configured correctly. "
@@ -428 +428 @@
 msgstr "Kod Grupları"
 
-#: lib/upgrade.php:59 lib/upgrade.php:118
+#: lib/upgrade.php:115 lib/upgrade.php:174
 msgid "Public Mixins"
 msgstr "Genel Mixinler"
 
-#: lib/upgrade.php:59 lib/upgrade.php:118
+#: lib/upgrade.php:115 lib/upgrade.php:174
 msgid "Admin Mixins"
 msgstr "Yönetici Mixinleri"
 
-#: lib/upgrade.php:93 lib/upgrade.php:234
+#: lib/upgrade.php:149 lib/upgrade.php:290
 msgid "Import Mixins"
 msgstr "Mixinleri Aktar"
 
-#: lib/upgrade.php:172 lib/upgrade.php:271
+#: lib/upgrade.php:228 lib/upgrade.php:327
 msgid "Admin"
 msgstr "Yönetici"
 
-#: lib/upgrade.php:172 lib/upgrade.php:271
+#: lib/upgrade.php:228 lib/upgrade.php:327
 msgid "Public"
 msgstr "Genel"
 
 #. translators: 1: Admin or Public 2: Language selected
-#: lib/upgrade.php:191 lib/upgrade.php:290
+#: lib/upgrade.php:247 lib/upgrade.php:346
 msgid "%1$s Side %2$s"
 msgstr "%1$s %2$s"
 
-#: lib/upgrade.php:347
+#: lib/upgrade.php:403
 msgid "Custom PHP Functions"
 msgstr "PHP Fonksiyonları"
 
-#: lib/upgrade.php:391 lib/upgrade.php:405
+#: lib/upgrade.php:447 lib/upgrade.php:461
 msgid "Admin Notes"
 msgstr "Admin Notları"

custom-codes/trunk/languages/custom-codes.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: CodeKit - Custom Codes Editor 2.3.1\n"
+"Project-Id-Version: CodeKit - Custom Codes Editor 2.3.2\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/custom-codes\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -10 +10 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2022-11-05T00:05:51+00:00\n"
+"POT-Creation-Date: 2022-11-08T19:02:47+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.7.1\n"
@@ -36 +36 @@
 
 #. translators: 1: WP Filesystem Method
-#: custom-codes.php:111
+#: custom-codes.php:112
 msgid "Your WordPress filesystem method \"%1$s\" is not configured correctly. Please configure it, or use another method like \"direct\" to be able to continue using the plugin."
 msgstr ""
@@ -430 +430 @@
 msgstr ""
 
-#: lib/upgrade.php:59
-#: lib/upgrade.php:118
+#: lib/upgrade.php:115
+#: lib/upgrade.php:174
 msgid "Public Mixins"
 msgstr ""
 
-#: lib/upgrade.php:59
-#: lib/upgrade.php:118
+#: lib/upgrade.php:115
+#: lib/upgrade.php:174
 msgid "Admin Mixins"
 msgstr ""
 
-#: lib/upgrade.php:93
-#: lib/upgrade.php:234
+#: lib/upgrade.php:149
+#: lib/upgrade.php:290
 msgid "Import Mixins"
 msgstr ""
 
-#: lib/upgrade.php:172
-#: lib/upgrade.php:271
+#: lib/upgrade.php:228
+#: lib/upgrade.php:327
 msgid "Admin"
 msgstr ""
 
-#: lib/upgrade.php:172
-#: lib/upgrade.php:271
+#: lib/upgrade.php:228
+#: lib/upgrade.php:327
 msgid "Public"
 msgstr ""
 
 #. translators: 1: Admin or Public 2: Language selected
-#: lib/upgrade.php:191
-#: lib/upgrade.php:290
+#: lib/upgrade.php:247
+#: lib/upgrade.php:346
 msgid "%1$s Side %2$s"
 msgstr ""
 
-#: lib/upgrade.php:347
+#: lib/upgrade.php:403
 msgid "Custom PHP Functions"
 msgstr ""
 
-#: lib/upgrade.php:391
-#: lib/upgrade.php:405
+#: lib/upgrade.php:447
+#: lib/upgrade.php:461
 msgid "Admin Notes"
 msgstr ""

custom-codes/trunk/lib/upgrade.php

@@ -28 +28 @@
 }
 add_action( 'setup_theme', 'codes_upgrade' );
+
+
+
+
+// FOR BEFORE 2.3.2 =======================================================.
+/**
+ * Create mixin posts.
+ *
+ * @param string $new_version New version number.
+ * @param string $old_version Old version number.
+ */
+function codes_move_multisite_codes( $new_version, $old_version ) {
+    global $wp_filesystem;
+
+    if ( ! version_compare( $old_version, '2.3.2', '<' ) ) {
+        return;
+    }
+
+    // List all the sites.
+    if ( function_exists( 'get_sites' ) && class_exists( 'WP_Site_Query' ) ) {
+
+        $sites = get_sites();
+        foreach ( $sites as $site ) {
+            switch_to_blog( $site->blog_id );
+
+            // Get all the codes belong to current blog ID.
+            $codes = get_posts(
+                array(
+                    'post_type'      => 'custom-code',
+                    'posts_per_page' => -1,
+                    'post_status'    => 'any',
+                )
+            );
+
+            // Early exit if posts are not ready.
+            if ( ! is_array( $codes ) ) {
+                continue;
+            }
+
+            // Process all the codes.
+            foreach ( $codes as $code ) {
+
+                // List & move all the files.
+                foreach ( glob( WP_CONTENT_DIR . "/custom_codes/$code->ID-*.*" ) as $source_file_path ) {
+                    $file_name             = basename( $source_file_path );
+                    $destination_file_path = WP_CONTENT_DIR . "/custom_codes/site-$site->blog_id/$file_name";
+                    $wp_filesystem->move( $source_file_path, $destination_file_path );
+                }
+            }
+
+            restore_current_blog();
+        }
+    }
+}
+add_action( 'codes_upgrade', 'codes_move_multisite_codes', 13, 2 );
+
 
 

custom-codes/trunk/readme.txt

@@ -143 +143 @@
 
 == Changelog ==
+= 2.3.2 (2022-11-08 21:58 EET) =
+* Codes directory has been updated on multisite to prevent conflicts
+* Old codes in common folder will be moved automatically after the update
+
 = 2.3.1 (2022-11-05 03:44 EET) =
 * Freemius SDK updated to 2.4.5