Changeset 3440134

Timestamp:

01/15/2026 08:40:56 AM (2 months ago)

Author:

yipresser

Message:

updated to v1.5.1

Location:

admin-optimizer/trunk

Files:

• admin-optimizer.php (modified) (1 diff)
• languages/admin-optimizer.pot (modified) (3 diffs)
• modules/xml-sitemap/settings/xml-sitemap-settings.php (modified) (2 diffs)
• modules/xml-sitemap/xml-sitemap.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)

admin-optimizer/trunk/admin-optimizer.php

@@ -4 +4 @@
  * Plugin URI: https://www.adminoptimizer.com
  * Description: An all-in-one plugin to enhance your WordPress sites
- * Version: 1.5.0
+ * Version: 1.5.1
  * Requires PHP: 7.4.0
  * Author: Yipresser

admin-optimizer/trunk/languages/admin-optimizer.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Admin Optimizer 1.5.0\n"
+"Project-Id-Version: Admin Optimizer 1.5.1\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/admin-optimizer\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: 2026-01-15T06:35:32+00:00\n"
+"POT-Creation-Date: 2026-01-15T08:38:56+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "X-Generator: WP-CLI 2.12.0\n"
@@ -3410 +3410 @@
 msgstr ""
 
-#: modules/xml-sitemap/settings/xml-sitemap-settings.php:183
-msgid "Change the sitemap URL. The default is wp-sitemap.xml"
-msgstr ""
-
-#: modules/xml-sitemap/settings/xml-sitemap-settings.php:184
+#. translators: %s: sitemap URL
+#: modules/xml-sitemap/settings/xml-sitemap-settings.php:187
+#, php-format
+msgid "Change the sitemap URL. The default is wp-sitemap.xml. Your current sitemap URL is %s"
+msgstr ""
+
+#: modules/xml-sitemap/settings/xml-sitemap-settings.php:190
 msgid "If you are not seeing the sitemap, go to Settings -> Permalinks, and press Save Changes to flush the rewrite rules."
 msgstr ""
 
-#: modules/xml-sitemap/settings/xml-sitemap-settings.php:301
+#: modules/xml-sitemap/settings/xml-sitemap-settings.php:307
 msgid "Open the post in the Post Editor. On the right menu, select \"Exclude from XML Sitemap\"."
 msgstr ""
 
-#: modules/xml-sitemap/settings/xml-sitemap-settings.php:327
+#: modules/xml-sitemap/settings/xml-sitemap-settings.php:333
 msgid "Admin Optimizer - XML Sitemap"
 msgstr ""
 
-#: modules/xml-sitemap/settings/xml-sitemap-settings.php:332
+#: modules/xml-sitemap/settings/xml-sitemap-settings.php:338
 msgid "The native WP sitemap has been disabled. Check if other Sitemap or SEO plugins have disabled it."
 msgstr ""

admin-optimizer/trunk/modules/xml-sitemap/settings/xml-sitemap-settings.php

@@ -181 +181 @@
         ?>
         <code><?php echo esc_url( home_url( '/' ) ); ?></code> <input id="custom-url" type="text" name="<?php echo esc_attr( XML_Sitemap::OPTION_NAME ); ?>[custom_sitemap_slug]" value="<?php echo esc_attr( $value ); ?>"><code><?php echo esc_html( '.xml' ); ?></code>
-        <p class="description"><?php esc_html_e( 'Change the sitemap URL. The default is wp-sitemap.xml', 'admin-optimizer' ); ?></p>
+        <p class="description">
+            <?php $sitemap_url = $this->get_sitemap_url(); ?>
+            <?php
+            /* translators: %s: sitemap URL */
+            printf( esc_html__( 'Change the sitemap URL. The default is wp-sitemap.xml. Your current sitemap URL is %s', 'admin-optimizer' ), '<a href="' . esc_url( $sitemap_url ) . '" target="_blank">' . esc_url( $sitemap_url ) . '</a>' );
+            ?>
+        </p>
         <p class="description"><?php esc_html_e( 'If you are not seeing the sitemap, go to Settings -> Permalinks, and press Save Changes to flush the rewrite rules.', 'admin-optimizer' ); ?></p>
         <?php
@@ -442 +448 @@
         return $sanitized_options;
     }
+
+    /**
+     * Get sitemap url
+     *
+     * @return string
+     */
+    private function get_sitemap_url() {
+        if ( ! empty( $this->options['custom_sitemap_slug'] ) ) {
+            return home_url( '/' . $this->options['custom_sitemap_slug'] . '.xml' );
+        } else {
+            return home_url( 'wp-sitemap.xml' );
+        }
+    }
 }

admin-optimizer/trunk/modules/xml-sitemap/xml-sitemap.php

@@ -218 +218 @@
             if ( ! str_contains( $robots_txt, '# BEGIN XML-SITEMAP LINK' ) ) {
                 $robots_txt                         .= "\n\n# BEGIN XML-SITEMAP LINK\n";
-                $robots_txt                         .= "Sitemap: {$this->get_sitemap_url()}\n";
+                $robots_txt                         .= 'Sitemap: ' . esc_url( $this->get_sitemap_url() ) . "\n";
                 $robots_txt                         .= '# END XML-SITEMAP LINK';
                 $robots_options['robotstxt_content'] = $robots_txt;
                 update_option( Ads_Robots_Txt::OPTION_NAME, $robots_options );
+            } else { // check if the sitemap url is still the same one.
+                preg_match( '/Sitemap: (.*).xml/', $robots_txt, $matches );
+                if ( ! empty( $matches[1] ) ) {
+                    $current_sitemap_url = $matches[1] . '.xml';
+                    if ( $current_sitemap_url !== $this->get_sitemap_url() ) {
+                        $this->remove_sitemap_link_robotstxt();
+                    }
+                }
             }
         }
@@ -238 +246 @@
             if ( str_contains( $robots_txt, '# BEGIN XML-SITEMAP LINK' ) ) {
                 $robots_txt                          = preg_replace( '/# BEGIN XML-SITEMAP LINK(.*)# END XML-SITEMAP LINK/s', '', $robots_txt );
-                $robots_options['robotstxt_content'] = $robots_txt;
+                $robots_options['robotstxt_content'] = rtrim( $robots_txt );
                 update_option( Ads_Robots_Txt::OPTION_NAME, $robots_options );
             }
@@ -251 +259 @@
     private function get_sitemap_url() {
         if ( ! empty( $this->options['custom_sitemap_slug'] ) ) {
-            return home_url( esc_url( $this->options['custom_sitemap_slug'] ) . '.xml' );
+            return home_url( '/' . $this->options['custom_sitemap_slug'] . '.xml' );
         } else {
             return home_url( 'wp-sitemap.xml' );
@@ -275 +283 @@
     public function fix_wp_sitemap_url( $url, $path ) {
         if ( '/wp-sitemap.xml' === $path ) {
-            $slug = esc_url( $this->options['custom_sitemap_slug'] );
+            $slug = $this->options['custom_sitemap_slug'];
             return str_replace( '/wp-sitemap.xml', "/{$slug}.xml", $url );
         }

admin-optimizer/trunk/readme.txt

@@ -7 +7 @@
 Requires PHP: 7.4.0
 Tested up to: 6.9
-Stable tag: 1.5.0
+Stable tag: 1.5.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -114 +114 @@
 
 == Changelog ==
+= 1.5.1 =
+Fixed: XML Sitemap URL wrongly set on robots.txt
+
 = 1.5.0 =
 Added: new XML Sitemap module