diff --git a/lang/litespeed-cache.pot b/lang/litespeed-cache.pot index f70450b9e..58d33934a 100644 --- a/lang/litespeed-cache.pot +++ b/lang/litespeed-cache.pot @@ -2,14 +2,14 @@ # This file is distributed under the GPLv3. msgid "" msgstr "" -"Project-Id-Version: LiteSpeed Cache 7.0\n" +"Project-Id-Version: LiteSpeed Cache 7.0.1\n" "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/litespeed-cache\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"POT-Creation-Date: 2025-03-19T21:54:15+00:00\n" +"POT-Creation-Date: 2025-04-08T18:55:51+00:00\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "X-Generator: WP-CLI 2.11.0\n" "X-Domain: litespeed-cache\n" @@ -173,9 +173,9 @@ msgid "Add new CDN URL" msgstr "" #: src/admin-display.cls.php:244 -#: src/admin-display.cls.php:972 -#: src/admin-display.cls.php:1000 -#: src/admin-display.cls.php:1051 +#: src/admin-display.cls.php:978 +#: src/admin-display.cls.php:1006 +#: src/admin-display.cls.php:1057 #: src/doc.cls.php:41 #: tpl/cache/settings-cache.tpl.php:22 #: tpl/cache/settings_inc.cache_mobile.tpl.php:71 @@ -188,9 +188,9 @@ msgid "ON" msgstr "" #: src/admin-display.cls.php:245 -#: src/admin-display.cls.php:973 -#: src/admin-display.cls.php:1000 -#: src/admin-display.cls.php:1051 +#: src/admin-display.cls.php:979 +#: src/admin-display.cls.php:1006 +#: src/admin-display.cls.php:1057 #: tpl/cache/settings-cache.tpl.php:22 #: tpl/cache/settings_inc.object.tpl.php:213 #: tpl/cdn/other.tpl.php:39 @@ -208,82 +208,82 @@ msgstr "" msgid "Settings" msgstr "" -#: src/admin-display.cls.php:526 +#: src/admin-display.cls.php:532 #: tpl/banner/slack.php:33 msgid "Dismiss" msgstr "" -#: src/admin-display.cls.php:837 -#: src/admin-display.cls.php:841 +#: src/admin-display.cls.php:843 +#: src/admin-display.cls.php:847 msgid "Save Changes" msgstr "" -#: src/admin-display.cls.php:1062 +#: src/admin-display.cls.php:1068 msgid "This setting is overwritten by the PHP constant %s" msgstr "" -#: src/admin-display.cls.php:1065 +#: src/admin-display.cls.php:1071 msgid "This setting is overwritten by the primary site setting" msgstr "" -#: src/admin-display.cls.php:1067 +#: src/admin-display.cls.php:1073 msgid "This setting is overwritten by the Network setting" msgstr "" -#: src/admin-display.cls.php:1071 +#: src/admin-display.cls.php:1077 msgid "currently set to %s" msgstr "" -#: src/admin-display.cls.php:1082 +#: src/admin-display.cls.php:1088 #: tpl/cache/settings_inc.object.tpl.php:106 #: tpl/crawler/settings.tpl.php:37 #: tpl/esi_widget_edit.php:70 msgid "seconds" msgstr "" -#: src/admin-display.cls.php:1114 -#: src/admin-display.cls.php:1118 +#: src/admin-display.cls.php:1120 +#: src/admin-display.cls.php:1124 #: tpl/cdn/other.tpl.php:84 msgid "Default value" msgstr "" -#: src/admin-display.cls.php:1143 +#: src/admin-display.cls.php:1149 msgid "Invalid rewrite rule" msgstr "" -#: src/admin-display.cls.php:1161 +#: src/admin-display.cls.php:1167 msgid "Path must end with %s" msgstr "" -#: src/admin-display.cls.php:1180 +#: src/admin-display.cls.php:1186 msgid "Minimum value" msgstr "" -#: src/admin-display.cls.php:1183 +#: src/admin-display.cls.php:1189 msgid "Maximum value" msgstr "" -#: src/admin-display.cls.php:1195 +#: src/admin-display.cls.php:1201 msgid "Zero, or" msgstr "" -#: src/admin-display.cls.php:1201 +#: src/admin-display.cls.php:1207 msgid "Larger than" msgstr "" -#: src/admin-display.cls.php:1203 +#: src/admin-display.cls.php:1209 msgid "Smaller than" msgstr "" -#: src/admin-display.cls.php:1206 +#: src/admin-display.cls.php:1212 msgid "Value range" msgstr "" -#: src/admin-display.cls.php:1232 +#: src/admin-display.cls.php:1238 msgid "Invalid IP" msgstr "" -#: src/admin-display.cls.php:1253 +#: src/admin-display.cls.php:1259 #: tpl/cache/settings-esi.tpl.php:95 #: tpl/page_optm/settings_css.tpl.php:194 #: tpl/page_optm/settings_html.tpl.php:123 @@ -301,44 +301,44 @@ msgstr "" msgid "API" msgstr "" -#: src/admin-display.cls.php:1255 +#: src/admin-display.cls.php:1261 msgid "Server variable(s) %s available to override this setting." msgstr "" -#: src/admin-display.cls.php:1268 +#: src/admin-display.cls.php:1274 msgid "The URLs will be compared to the REQUEST_URI server variable." msgstr "" -#: src/admin-display.cls.php:1269 +#: src/admin-display.cls.php:1275 msgid "For example, for %s, %s can be used here." msgstr "" -#: src/admin-display.cls.php:1271 +#: src/admin-display.cls.php:1277 msgid "To match the beginning, add %s to the beginning of the item." msgstr "" -#: src/admin-display.cls.php:1272 +#: src/admin-display.cls.php:1278 msgid "To do an exact match, add %s to the end of the URL." msgstr "" -#: src/admin-display.cls.php:1273 +#: src/admin-display.cls.php:1279 #: src/doc.cls.php:114 msgid "One per line." msgstr "" -#: src/admin-display.cls.php:1288 +#: src/admin-display.cls.php:1294 msgid "%s groups" msgstr "" -#: src/admin-display.cls.php:1291 +#: src/admin-display.cls.php:1297 msgid "%s images" msgstr "" -#: src/admin-display.cls.php:1300 +#: src/admin-display.cls.php:1306 msgid "%s group" msgstr "" -#: src/admin-display.cls.php:1303 +#: src/admin-display.cls.php:1309 msgid "%s image" msgstr "" @@ -526,11 +526,11 @@ msgstr "" msgid "Sync credit allowance with Cloud Server successfully." msgstr "" -#: src/conf.cls.php:516 +#: src/conf.cls.php:519 msgid "Saving option failed. IPv4 only for %s." msgstr "" -#: src/conf.cls.php:693 +#: src/conf.cls.php:696 msgid "Changed setting successfully." msgstr "" @@ -574,24 +574,24 @@ msgstr "" msgid "Previously existed in blocklist" msgstr "" -#: src/data.cls.php:225 +#: src/data.cls.php:226 msgid "The database has been upgrading in the background since %s. This message will disappear once upgrade is complete." msgstr "" -#: src/data.upgrade.func.php:170 +#: src/data.upgrade.func.php:216 msgid "LiteSpeed Cache upgraded successfully. NOTE: Due to changes in this version, the settings %1$s and %2$s have been turned OFF. Please turn them back on manually and verify that your site layout is correct, and you have no JS errors." msgstr "" -#: src/data.upgrade.func.php:174 +#: src/data.upgrade.func.php:220 #: src/lang.cls.php:151 msgid "JS Combine" msgstr "" -#: src/data.upgrade.func.php:175 +#: src/data.upgrade.func.php:221 msgid "JS Defer" msgstr "" -#: src/data.upgrade.func.php:177 +#: src/data.upgrade.func.php:223 msgid "Click here to settings" msgstr "" @@ -2195,23 +2195,23 @@ msgstr "" msgid "Install" msgstr "" -#: tpl/banner/cloud_promo.tpl.php:13 +#: tpl/banner/cloud_promo.tpl.php:14 msgid "You just unlocked a promotion from QUIC.cloud!" msgstr "" -#: tpl/banner/cloud_promo.tpl.php:17 +#: tpl/banner/cloud_promo.tpl.php:18 msgid "Spread the love and earn %s credits to use in our QUIC.cloud online services." msgstr "" -#: tpl/banner/cloud_promo.tpl.php:24 +#: tpl/banner/cloud_promo.tpl.php:25 msgid "Send to twitter to get %s bonus" msgstr "" -#: tpl/banner/cloud_promo.tpl.php:29 +#: tpl/banner/cloud_promo.tpl.php:30 msgid "Learn more" msgstr "" -#: tpl/banner/cloud_promo.tpl.php:34 +#: tpl/banner/cloud_promo.tpl.php:35 msgid "Tweet preview" msgstr "" @@ -2233,7 +2233,7 @@ msgstr "" #: tpl/banner/new_version.php:71 #: tpl/banner/new_version_dev.tpl.php:24 -#: tpl/toolbox/beta_test.tpl.php:62 +#: tpl/toolbox/beta_test.tpl.php:63 msgid "Upgrade" msgstr "" @@ -5027,7 +5027,7 @@ msgid "Comments are supported. Start a line with a %s to turn it into a comment msgstr "" #: tpl/page_optm/settings_localization.tpl.php:127 -#: tpl/toolbox/beta_test.tpl.php:30 +#: tpl/toolbox/beta_test.tpl.php:31 msgid "Example" msgstr "" @@ -5495,48 +5495,48 @@ msgstr "" msgid "Restore Settings" msgstr "" -#: tpl/toolbox/beta_test.tpl.php:25 +#: tpl/toolbox/beta_test.tpl.php:26 msgid "Try GitHub Version" msgstr "" -#: tpl/toolbox/beta_test.tpl.php:29 +#: tpl/toolbox/beta_test.tpl.php:30 msgid "Use this section to switch plugin versions. To beta test a GitHub commit, enter the commit URL in the field below." msgstr "" -#: tpl/toolbox/beta_test.tpl.php:34 +#: tpl/toolbox/beta_test.tpl.php:35 msgid "Use latest GitHub Dev commit" msgstr "" -#: tpl/toolbox/beta_test.tpl.php:36 +#: tpl/toolbox/beta_test.tpl.php:37 msgid "Use latest GitHub Master commit" msgstr "" -#: tpl/toolbox/beta_test.tpl.php:38 -#: tpl/toolbox/beta_test.tpl.php:54 +#: tpl/toolbox/beta_test.tpl.php:39 +#: tpl/toolbox/beta_test.tpl.php:55 msgid "Use latest WordPress release version" msgstr "" -#: tpl/toolbox/beta_test.tpl.php:38 +#: tpl/toolbox/beta_test.tpl.php:39 msgid "OR" msgstr "" -#: tpl/toolbox/beta_test.tpl.php:49 +#: tpl/toolbox/beta_test.tpl.php:50 msgid "Downgrade not recommended. May cause fatal error due to refactored code." msgstr "" -#: tpl/toolbox/beta_test.tpl.php:53 +#: tpl/toolbox/beta_test.tpl.php:54 msgid "Press the %s button to use the most recent GitHub commit. Master is for release candidate & Dev is for experimental testing." msgstr "" -#: tpl/toolbox/beta_test.tpl.php:53 +#: tpl/toolbox/beta_test.tpl.php:54 msgid "Use latest GitHub Dev/Master commit" msgstr "" -#: tpl/toolbox/beta_test.tpl.php:54 +#: tpl/toolbox/beta_test.tpl.php:55 msgid "Press the %s button to stop beta testing and go back to the current release from the WordPress Plugin Directory." msgstr "" -#: tpl/toolbox/beta_test.tpl.php:59 +#: tpl/toolbox/beta_test.tpl.php:60 msgid "In order to avoid an upgrade error, you must be using %1$s or later before you can upgrade to %2$s versions." msgstr "" diff --git a/litespeed-cache.php b/litespeed-cache.php index df4eae859..47b613a8a 100644 --- a/litespeed-cache.php +++ b/litespeed-cache.php @@ -4,7 +4,7 @@ * Plugin Name: LiteSpeed Cache * Plugin URI: https://www.litespeedtech.com/products/cache-plugins/wordpress-acceleration * Description: High-performance page caching and site optimization from LiteSpeed - * Version: 7.0 + * Version: 7.0.1 * Author: LiteSpeed Technologies * Author URI: https://www.litespeedtech.com * License: GPLv3 @@ -12,7 +12,7 @@ * Text Domain: litespeed-cache * Domain Path: /lang * - * Copyright (C) 2015-2024 LiteSpeed Technologies, Inc. + * Copyright (C) 2015-2025 LiteSpeed Technologies, Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -34,7 +34,7 @@ return; } -!defined('LSCWP_V') && define('LSCWP_V', '7.0'); +!defined('LSCWP_V') && define('LSCWP_V', '7.0.1'); !defined('LSCWP_CONTENT_DIR') && define('LSCWP_CONTENT_DIR', WP_CONTENT_DIR); !defined('LSCWP_DIR') && define('LSCWP_DIR', __DIR__ . '/'); // Full absolute path '/var/www/html/***/wp-content/plugins/litespeed-cache/' or MU @@ -46,11 +46,11 @@ * @since 5.2 Auto correct protocol for CONTENT URL */ $WP_CONTENT_URL = WP_CONTENT_URL; -$home_url = home_url('/'); -if (substr($WP_CONTENT_URL, 0, 5) == 'http:' && substr($home_url, 0, 5) == 'https') { +$site_url = site_url('/'); +if (substr($WP_CONTENT_URL, 0, 5) == 'http:' && substr($site_url, 0, 5) == 'https') { $WP_CONTENT_URL = str_replace('http://', 'https://', $WP_CONTENT_URL); } -!defined('LSCWP_CONTENT_FOLDER') && define('LSCWP_CONTENT_FOLDER', str_replace($home_url, '', $WP_CONTENT_URL)); // `wp-content` +!defined('LSCWP_CONTENT_FOLDER') && define('LSCWP_CONTENT_FOLDER', str_replace($site_url, '', $WP_CONTENT_URL)); // `wp-content` !defined('LSWCP_PLUGIN_URL') && define('LSWCP_PLUGIN_URL', plugin_dir_url(__FILE__)); // Full URL path '//example.com/wp-content/plugins/litespeed-cache/' /** diff --git a/readme.txt b/readme.txt index bdcbd0877..54d7223c9 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: caching, optimize, performance, pagespeed, seo, image optimize, object cac Requires at least: 5.3 Requires PHP: 7.2 Tested up to: 6.7 -Stable tag: 6.5.1 +Stable tag: 7.0.1 License: GPLv3 License URI: http://www.gnu.org/licenses/gpl.html @@ -255,6 +255,15 @@ You can report security bugs through the Patchstack Vulnerability Disclosure Pro == Changelog == += 7.0.1 - Apr 8 2025 = +* **Page Optimize** Migrate legacy data to append trailing slash for better compatibility with v7.0-optimized UCSS/CCSS data. + += 7.0.0.1 - Mar 26 2025 = +* **GUI** Resolved a banner message display error that occurred in certain old version cases. +* **GUI** Fixed a continual error banner that appeared when sites weren't using QUIC.cloud. +* **Config** Fixed a continual CDN sync_conf/purge check issue that occured after v7.0 upgrade. +* **3rd** Improved WPML multi language sync_conf compatibility. + = 7.0 - Mar 25 2025 = * 🌱**Image Optimization** Added AVIF format. * **Core** Changed plugin classes auto load to preload all to prevent upgrade problems. diff --git a/src/admin-display.cls.php b/src/admin-display.cls.php index b78362caa..aecbe0c50 100644 --- a/src/admin-display.cls.php +++ b/src/admin-display.cls.php @@ -370,6 +370,12 @@ public static function success($msg, $echo = false, $irremovable = false, $addit { self::add_notice(self::NOTICE_GREEN, $msg, $echo, $irremovable, $additional_classes); } + /** @deprecated 4.7 */ + /** will drop in v7.5 */ + public static function succeed($msg, $echo = false, $irremovable = false, $additional_classes = '') + { + self::success($msg, $echo, $irremovable, $additional_classes); + } /** * Display error notice diff --git a/src/cloud.cls.php b/src/cloud.cls.php index e0f4f1fa8..85544e7c5 100644 --- a/src/cloud.cls.php +++ b/src/cloud.cls.php @@ -81,7 +81,7 @@ class Cloud extends Base private static $WP_SVC_SET = array(self::API_NEWS, self::API_VER, self::API_BETA_TEST, self::API_REST_ECHO); // No api key needed for these services - private static $_PUB_SVC_SET = array(self::API_NEWS, self::API_REPORT, self::API_VER, self::API_BETA_TEST, self::API_REST_ECHO, self::SVC_D_V3UPGRADE); + private static $_PUB_SVC_SET = array(self::API_NEWS, self::API_REPORT, self::API_VER, self::API_BETA_TEST, self::API_REST_ECHO, self::SVC_D_V3UPGRADE, self::SVC_D_DASH); private static $_QUEUE_SVC_SET = array(self::SVC_UCSS, self::SVC_VPI); @@ -1268,7 +1268,7 @@ private function _maybe_cloud($service_tag) } if (!$this->activated() && $service_tag != self::SVC_D_ACTIVATE) { - Admin_Display::error(Error::msg('setup_required')); + Admin_Display::error(Error::msg('qc_setup_required')); return false; } @@ -1352,7 +1352,7 @@ private function _post($service, $data = false, $time_out = false) self::debug('data', $data); $param = array( - 'site_url' => home_url(), + 'site_url' => home_url(), // Need to use home_url() as WPML case may change it for diff langs, therefore we can do auto alias 'main_domain' => !empty($this->_summary['main_domain']) ? $this->_summary['main_domain'] : '', 'wp_pk_b64' => !empty($this->_summary['pk_b64']) ? $this->_summary['pk_b64'] : '', 'ver' => Core::VER, diff --git a/src/conf.cls.php b/src/conf.cls.php index e7c00ccdb..14ca5cc47 100644 --- a/src/conf.cls.php +++ b/src/conf.cls.php @@ -100,6 +100,9 @@ private function _conf_db_init() if (!$ver) { // New install $this->set_conf(self::$_default_options); + + // Check new version @since 2.9.3 + Cloud::version_check('activate' . (defined('LSCWP_REF') ? '_' . LSCWP_REF : '')); } // Init new default/missing options @@ -123,10 +126,10 @@ private function _conf_db_init() // Mark as conf loaded defined('LITESPEED_CONF_LOADED') || define('LITESPEED_CONF_LOADED', true); - // Check new version @since 2.9.3 - Cloud::version_check('activate' . (defined('LSCWP_REF') ? '_' . LSCWP_REF : '')); - - $this->update_confs(); // Files only get corrected in activation or saving settings actions. + if (!$ver || $ver != Core::VER) { + // Only trigger once in upgrade progress, don't run always + $this->update_confs(); // Files only get corrected in activation or saving settings actions. + } } /** diff --git a/src/data.cls.php b/src/data.cls.php index 2f502e2e6..38b912c8f 100644 --- a/src/data.cls.php +++ b/src/data.cls.php @@ -25,6 +25,7 @@ class Data extends Root '4.4.4-b1' => array('litespeed_update_4_4_4'), '5.3-a5' => array('litespeed_update_5_3'), '7.0-b26' => array('litespeed_update_7'), + '7.0.1-b1' => array('litespeed_update_7_0_1'), ); private $_db_site_updater = array( @@ -354,7 +355,12 @@ public function tb($tb) public function tb_exist($tb) { global $wpdb; - return $wpdb->get_var("SHOW TABLES LIKE '" . $this->tb($tb) . "'"); + + $wpdb->suppress_errors( true ); + $describe = $wpdb->get_results( "DESCRIBE " . $this->tb( $tb ) ); + $wpdb->suppress_errors( false ); + + return null !== $describe; } /** diff --git a/src/data.upgrade.func.php b/src/data.upgrade.func.php index 073818480..5d90d0a63 100644 --- a/src/data.upgrade.func.php +++ b/src/data.upgrade.func.php @@ -15,6 +15,56 @@ use LiteSpeed\File; use LiteSpeed\Cloud; +/** + * Migrate v7.0- url_files URL from no trailing slash to trailing slash + * @since 7.0.1 + */ +function litespeed_update_7_0_1() +{ + global $wpdb; + Debug2::debug('[Data] v7.0.1 upgrade started'); + + $tb_url = $wpdb->prefix . 'litespeed_url'; + + $wpdb->suppress_errors( true ); + $tb_describe = $wpdb->get_var( "DESCRIBE `" . $tb_url . "`" ); + $wpdb->suppress_errors( false ); + + if ( null === $tb_describe ) { + Debug2::debug('[Data] Table `litespeed_url` not found, bypassed migration'); + return; + } + + $q = "SELECT * FROM `$tb_url` WHERE url LIKE 'https://%/'"; + $q = $wpdb->prepare($q); + $list = $wpdb->get_results($q, ARRAY_A); + $existing_urls = array(); + if ($list) { + foreach ($list as $v) { + $existing_urls[] = $v['url']; + } + } + + $q = "SELECT * FROM `$tb_url` WHERE url LIKE 'https://%'"; + $q = $wpdb->prepare($q); + $list = $wpdb->get_results($q, ARRAY_A); + if (!$list) { + return; + } + foreach ($list as $v) { + if (substr($v['url'], -1) == '/') { + continue; + } + $new_url = $v['url'] . '/'; + if (in_array($new_url, $existing_urls)) { + continue; + } + $q = "UPDATE `$tb_url` SET url = %s WHERE id = %d"; + $q = $wpdb->prepare($q, $new_url, $v['id']); + $wpdb->query($q); + } +} + /** * Migrate from domain key to pk/sk for QC * @since 7.0 @@ -60,8 +110,12 @@ function litespeed_update_5_3() { global $wpdb; Debug2::debug('[Data] Upgrade url_file table'); - $tb_exists = $wpdb->get_var('SHOW TABLES LIKE "' . $wpdb->prefix . 'litespeed_url_file"'); - if ($tb_exists) { + + $wpdb->suppress_errors( true ); + $tb_describe = $wpdb->get_var( "DESCRIBE `" . $wpdb->prefix . 'litespeed_url_file`' ); + $wpdb->suppress_errors( false ); + + if ( null !== $tb_describe ) { $q = 'ALTER TABLE `' . $wpdb->prefix . @@ -81,8 +135,12 @@ function litespeed_update_4_4_4() { global $wpdb; Debug2::debug('[Data] Upgrade url_file table'); - $tb_exists = $wpdb->get_var('SHOW TABLES LIKE "' . $wpdb->prefix . 'litespeed_url_file"'); - if ($tb_exists) { + + $wpdb->suppress_errors( true ); + $tb_describe = $wpdb->get_var( "DESCRIBE `" . $wpdb->prefix . 'litespeed_url_file`' ); + $wpdb->suppress_errors( false ); + + if ( null !== $tb_describe ) { $q = 'ALTER TABLE `' . $wpdb->prefix . @@ -125,8 +183,12 @@ function litespeed_update_4() { global $wpdb; $tb = $wpdb->prefix . 'litespeed_cssjs'; - $existed = $wpdb->get_var("SHOW TABLES LIKE '$tb'"); - if (!$existed) { + + $wpdb->suppress_errors( true ); + $tb_describe = $wpdb->get_var( "DESCRIBE `" . $tb . "`" ); + $wpdb->suppress_errors( false ); + + if ( null === $tb_describe ) { return; } @@ -665,8 +727,12 @@ function litespeed_update_3_0($ver) // Update image optm table Debug2::debug('[Data] Upgrade img_optm table'); - $tb_exists = $wpdb->get_var('SHOW TABLES LIKE "' . $wpdb->prefix . 'litespeed_img_optm"'); - if ($tb_exists) { + + $wpdb->suppress_errors( true ); + $tb_describe = $wpdb->get_var( "DESCRIBE `" . $wpdb->prefix . 'litespeed_img_optm`' ); + $wpdb->suppress_errors( false ); + + if ( null !== $tb_describe ) { $status_mapping = array( 'requested' => 3, 'notified' => 6, diff --git a/src/htaccess.cls.php b/src/htaccess.cls.php index 46911275c..6aa2dfaac 100644 --- a/src/htaccess.cls.php +++ b/src/htaccess.cls.php @@ -543,7 +543,7 @@ private function _generate_rules($cfg) $new_rules[] = ''; } - // caching php resource + // caching php resource TODO: consider drop $id = Base::O_CACHE_RES; if (!empty($cfg[$id])) { $new_rules[] = $new_rules_backend[] = self::MARKER_CACHE_RESOURCE . self::MARKER_START; diff --git a/tpl/banner/cloud_promo.tpl.php b/tpl/banner/cloud_promo.tpl.php index 74b39999a..a44cc63e2 100644 --- a/tpl/banner/cloud_promo.tpl.php +++ b/tpl/banner/cloud_promo.tpl.php @@ -1,7 +1,8 @@ @@ -13,15 +14,15 @@

' . $this->_summary['promo'][0]['quota'] . '' ); ?>

_summary['promo'][0]['quota'] ); ?> @@ -31,24 +32,23 @@

- + \ No newline at end of file diff --git a/tpl/toolbox/beta_test.tpl.php b/tpl/toolbox/beta_test.tpl.php index f5d975fc2..d2ab4ff13 100644 --- a/tpl/toolbox/beta_test.tpl.php +++ b/tpl/toolbox/beta_test.tpl.php @@ -6,7 +6,8 @@ // Existing public version list $v_list = array( - '7.0', + '7.0.1', + '7.0.0.1', '6.5.4', '6.4.1', '6.3.0.1',