Changeset 3482475

Timestamp:

03/14/2026 10:26:26 AM (2 weeks ago)

Author:

timwhitlock

Message:

Bumped WordPress compatibility to 6.9.4

Location:

loco-translate/trunk

Files:

• languages/loco-translate.pot (modified) (4 diffs)
• readme.txt (modified) (1 diff)
• src/admin/config/VersionController.php (modified) (3 diffs)
• src/mvc/View.php (modified) (4 diffs)
• src/mvc/ViewParams.php (modified) (3 diffs)
• tpl/admin/config/version.php (modified) (2 diffs)

loco-translate/trunk/languages/loco-translate.pot

@@ -2 +2 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Loco Translate 2.8.2\n"
+"Project-Id-Version: Loco Translate 2.8.3-dev\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/loco-translate/\n"
-"POT-Creation-Date: 2026-03-01 07:58+0000\n"
+"POT-Creation-Date: 2026-03-14 10:22+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -14 +14 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Loco https://localise.biz/\n"
-"X-Loco-Version: 2.8.2; wp-6.9.1; php-8.3.27\n"
+"X-Loco-Version: 2.8.3-dev; wp-6.9.4; php-8.3.27\n"
 "X-Domain: loco-translate"
 
@@ -1018 +1018 @@
 
 #: src/ajax/ApisController.php:26 src/admin/file/EditController.php:214
+#: tpl/admin/bundle/conf.php:147
 msgid "Help"
 msgstr ""
@@ -1591 +1592 @@
 msgstr ""
 
-#: tpl/admin/bundle/conf.php:159 tpl/admin/bundle/setup/saved.php:18
+#: tpl/admin/bundle/conf.php:160 tpl/admin/bundle/setup/saved.php:18
 msgid "Reset config"
 msgstr ""

loco-translate/trunk/readme.txt

@@ -103 +103 @@
 
 = 2.8.3 =
-* WIP
+* Bumped WordPress compatibility to 6.9.4
+* Additional restrictions on viewing source code refs
+* Fix for CVE-2026-4146: Thanks Jack Pas (Dark.)
 
 = 2.8.2 =

loco-translate/trunk/src/admin/config/VersionController.php

@@ -23 +23 @@
         $breadcrumb = new Loco_admin_Navigation;
         $breadcrumb->add( $title );
+        $this->setLocoUpdate('0');
         
         // current plugin version
@@ -41 +42 @@
         }
         
-        
-        // check PHP version, noting that we want to move to minimum version 5.6 as per latest WordPress
+        // check PHP version is at least 7.4
         $phpversion = PHP_VERSION;
         if( version_compare($phpversion,'7.4.0','<') ){
@@ -48 +48 @@
         }
         
-        
         // check WordPress version, No plans to increase this until WP bumps their min PHP requirement.
         $wpversion = $GLOBALS['wp_version'];
-        /*if( version_compare($wpversion,'5.2','<') ){
-            $this->setWpUpdate('5.2');
-        }*/
-        
         return $this->view('admin/config/version', compact('breadcrumb','version','phpversion','wpversion') ); 
     }
 
 
-    /**
-     * @param string version
-     */
-    private function setLocoUpdate( $version ){
-        $action = 'upgrade-plugin_'.loco_plugin_self();
-        $link = admin_url( 'update.php?action=upgrade-plugin&plugin='.rawurlencode(loco_plugin_self()) );
-        $this->set('update', $version );
-        $this->set('update_href', wp_nonce_url( $link, $action ) );
+
+    private function setLocoUpdate( string $version ){
+        if( $version ){
+            $action = 'upgrade-plugin_'.loco_plugin_self();
+            $link = admin_url( 'update.php?action=upgrade-plugin&plugin='.rawurlencode(loco_plugin_self()) );
+            $this->set('update', $version );
+            $this->set('update_href', wp_nonce_url( $link, $action ) );
+        }
+        else {
+            $this->set('update','');
+            $this->set('update_href','');
+        }
     }
-
-
-    /**
-     * @param string minimum recommended version
-     *
-    private function setWpUpdate( $version ){
-        $this->set('wpupdate',$version);
-        $this->set('wpupdate_href', admin_url('update-core.php') );
-    }*/
 
     

loco-translate/trunk/src/mvc/View.php

@@ -147 +147 @@
 
     /**
-     * @param string $prop
-     * @return bool
+     * Test if a view argument exists
      */
     public function has( string $prop ):bool {
@@ -157 +156 @@
     /**
      * Get property after checking with self::has
-     * @param string $prop
      * @return mixed
      */
@@ -167 +165 @@
     /**
      * Set a view argument
-     * @param string $prop
-     * @param mixed $value
-     *
-     * @return Loco_mvc_View
      */
     public function set( string $prop, $value ):self {
@@ -178 +172 @@
 
 
+    /**
+     * Remove a view argument
+     */
+    public function unset( string $prop ):void {
+        $this->scope->offsetUnset($prop);
+    }
+    
 
     /**

loco-translate/trunk/src/mvc/ViewParams.php

@@ -66 +66 @@
     /**
      * @internal
-     * @param string $p property name
      * @return mixed
      */
-    public function __get( $p ){
+    public function __get( string $p ){
         return $this->offsetExists($p) ? $this->offsetGet($p) : null;
     }
@@ -76 +75 @@
     /**
      * Test if a property exists, even if null
-     * @param string $p property name
-     * @return bool
-     */
-    public function has( $p ){
+     */
+    public function has( string  $p ):bool {
         return $this->offsetExists($p);
+    }
+
+
+    /**
+     * Test if a property exists and is truthy
+     */
+    public function truthy( string $p ):bool {
+        return $this->offsetExists($p) && $this->offsetGet($p);
     }
 
@@ -89 +94 @@
      * @return string empty string
      */
-    public function e( $p ){
+    public function e( string $p ):string {
         $text = $this->__get($p);
         echo $this->escape( $text );

loco-translate/trunk/tpl/admin/config/version.php

@@ -4 +4 @@
  */
 $this->extend('../layout');
-
+    /* @var Loco_mvc_ViewParams $params */
     // Loco Translate version:
-    if( $params->has('update') ):?> 
+    if( $params->truthy('update') && $params->truthy('update_href') ):?> 
     <div class="panel panel-warning">
         <h3 class="has-icon">
@@ -15 +15 @@
         </p>
         <p class="submit">
-            <a class="button button-primary" href="<?php echo $update_href?>" target="_blank"><?php self::e(__('Upgrade to %s','loco-translate'), 'v'.$update )?></a>
+            <a class="button button-primary" href="<?php echo esc_url($update_href)?>" target="_blank"><?php self::e(__('Upgrade to %s','loco-translate'), 'v'.$update )?></a>
             <a class="button button-link has-icon icon-ext" href="https://wordpress.org/plugins/loco-translate/installation/" target="_blank"><?php esc_html_e('Install manually','loco-translate')?></a>
         </p>