WordPress.org

Plugin Directory

Changeset 810006


Ignore:
Timestamp:
11/25/13 09:32:13 (5 months ago)
Author:
fredericktownes
Message:

Release 0.9.3 hot fixes.

Location:
w3-total-cache/tags/0.9.3
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • w3-total-cache/tags/0.9.3/inc/functions/admin.php

    r754930 r810006  
    642642    return $_SERVER['HTTP_HOST']; 
    643643} 
     644 
     645/* 
     646 * Returns current w3tc admin page 
     647 */ 
     648function w3tc_get_current_page() { 
     649    w3_require_once(W3TC_LIB_W3_DIR . '/Request.php'); 
     650 
     651    $page = W3_Request::get_string('page'); 
     652 
     653    switch (true) { 
     654        case ($page == 'w3tc_dashboard'): 
     655        case ($page == 'w3tc_general'): 
     656        case ($page == 'w3tc_pgcache'): 
     657        case ($page == 'w3tc_minify'): 
     658        case ($page == 'w3tc_dbcache'): 
     659        case ($page == 'w3tc_objectcache'): 
     660        case ($page == 'w3tc_fragmentcache'): 
     661        case ($page == 'w3tc_browsercache'): 
     662        case ($page == 'w3tc_mobile'): 
     663        case ($page == 'w3tc_referrer'): 
     664        case ($page == 'w3tc_cdn'): 
     665        case ($page == 'w3tc_monitoring'): 
     666        case ($page == 'w3tc_extensions'): 
     667        case ($page == 'w3tc_install'): 
     668        case ($page == 'w3tc_faq'): 
     669        case ($page == 'w3tc_about'): 
     670        case ($page == 'w3tc_support'): 
     671            break; 
     672 
     673        default: 
     674            $page = 'w3tc_dashboard'; 
     675    } 
     676 
     677    return $page; 
     678} 
  • w3-total-cache/tags/0.9.3/lib/W3/AdminActions/CdnActionsAdmin.php

    r754930 r810006  
    1515        $this->_config = w3_instance('W3_Config'); 
    1616        w3_require_once(W3TC_LIB_W3_DIR . '/Request.php'); 
    17         $this->_page = W3_Request::get_string('page'); 
     17        w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/admin.php'); 
     18        $this->_page = w3tc_get_current_page(); 
    1819    } 
    1920 
     
    367368        $config = W3_Request::get_array('config'); 
    368369 
    369         //TODO: Workaround to support test case cdn/a04 
    370         if (!isset($config['host'])) { 
     370        //TODO: Workaround to support test case cdn/a04 
     371        if ($engine == 'ftp' && !isset($config['host'])) { 
    371372            $config = W3_Request::get_string('config'); 
    372373            $config = json_decode($config, true); 
  • w3-total-cache/tags/0.9.3/lib/W3/AdminActions/DefaultActionsAdmin.php

    r754930 r810006  
    3636        w3_require_once(W3TC_LIB_W3_DIR . '/Request.php'); 
    3737 
    38         $this->_page = W3_Request::get_string('page'); 
     38        w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/admin.php'); 
     39        $this->_page = w3tc_get_current_page(); 
    3940    } 
    4041 
     
    6768            case 'pgcache': 
    6869                w3_wp_delete_file(W3TC_ADDIN_FILE_ADVANCED_CACHE); 
    69                 break; 
     70                $src = W3TC_INSTALL_FILE_ADVANCED_CACHE; 
     71                $dst = W3TC_ADDIN_FILE_ADVANCED_CACHE; 
     72                try { 
     73                    w3_wp_copy_file($src, $dst); 
     74                } catch (FilesystemOperationException $ex) {} 
     75                break; 
    7076            case 'dbcache': 
    7177                w3_wp_delete_file(W3TC_ADDIN_FILE_DB); 
  • w3-total-cache/tags/0.9.3/lib/W3/AdminActions/SupportActionsAdmin.php

    r754930 r810006  
    5252     */ 
    5353    public $_config; 
    54  
    55     function __construct() { 
     54    /** 
     55    * Current page 
     56    * 
     57    * @var string 
     58    */ 
     59    var $_page = 'w3tc_support'; 
     60     
     61    function __construct() { 
    5662        $this->_config = w3_instance('W3_Config'); 
    5763        $this->_request_types = array( 
     
    6470            'linux_config' => __('Linux Server Optimization & Plugin Configuration: Starting @ $200 USD', 'w3-total-cache') 
    6571        ); 
     72        w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/admin.php'); 
     73        $this->_page = w3tc_get_current_page(); 
    6674    } 
    6775 
  • w3-total-cache/tags/0.9.3/lib/W3/GenericAdminEnvironment.php

    r754930 r810006  
    8282     */ 
    8383    private function create_required_files($config, $exs) { 
     84        w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/other.php'); 
     85        w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/ui.php'); 
     86 
    8487        $src = W3TC_INSTALL_FILE_ADVANCED_CACHE; 
    8588        $dst = W3TC_ADDIN_FILE_ADVANCED_CACHE; 
     
    9194                    return; 
    9295            } else { 
    93                 $remove_url = is_network_admin() ? 
    94                               network_admin_url('admin.php?page=' . $_GET['page'] . '&w3tc_default_remove_add_in=pgcache') : 
    95                     admin_url('admin.php?page=' . $_GET['page'] . '&w3tc_default_remove_add_in=pgcache'); 
     96                w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/other.php'); 
     97                w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/ui.php'); 
     98                $remove_url = w3_admin_url('admin.php?page=w3tc_dashboard&w3tc_default_remove_add_in=pgcache'); 
     99 
    96100                $exs->push(new FilesystemOperationException( 
    97101                    sprintf(__('The Page Cache add-in file advanced-cache.php is not a W3 Total Cache drop-in. 
  • w3-total-cache/tags/0.9.3/lib/W3/PgCacheAdminEnvironment.php

    r754930 r810006  
    412412        $data = $original_data; 
    413413 
    414         $new_data = w3_erase_rules($data, W3TC_MARKER_BEGIN_PGCACHE_LEGACY, 
    415             W3TC_MARKER_END_PGCACHE_LEGACY); 
    416         $has_legacy = strlen($new_data) < strlen($data); 
    417         $data = $new_data; 
    418  
    419         $new_data = w3_erase_rules($data, W3TC_MARKER_BEGIN_PGCACHE_WPSC, 
    420             W3TC_MARKER_END_PGCACHE_WPSC); 
    421         $has_wpsc = strlen($new_data) < strlen($data); 
    422         $data = $new_data; 
     414        if ($has_legacy = w3_has_rules($data, W3TC_MARKER_BEGIN_PGCACHE_LEGACY, W3TC_MARKER_END_PGCACHE_LEGACY)) 
     415            $data = w3_erase_rules($data, W3TC_MARKER_BEGIN_PGCACHE_LEGACY, W3TC_MARKER_END_PGCACHE_LEGACY); 
     416             
     417        if ($has_wpsc = w3_has_rules($data, W3TC_MARKER_BEGIN_PGCACHE_WPSC, W3TC_MARKER_END_PGCACHE_WPSC)) 
     418            $data = w3_erase_rules($data, W3TC_MARKER_BEGIN_PGCACHE_WPSC, W3TC_MARKER_END_PGCACHE_WPSC); 
    423419 
    424420        $rules = $this->rules_core_generate($config); 
  • w3-total-cache/tags/0.9.3/lib/W3/Pro/FragmentCache.php

    r754930 r810006  
    101101     * @var integer 
    102102     */ 
    103     var $_lifetime = null; 
     103    var $_lifetime = 0; 
    104104 
    105105    /** 
     
    227227        list($fragment_group, $fragment_group_expiration) =  
    228228            $this->_fragment_group($id); 
    229         if (!is_null($fragment_group_expiration)) 
    230             $expire = $fragment_group_expiration; 
     229        if (is_int($fragment_group_expiration)) 
     230            $expire = (int)$fragment_group_expiration; 
    231231 
    232232        $this->cache[$fragment_group . $group][$key] = $data; 
  • w3-total-cache/tags/0.9.3/lib/W3/UI/PluginView.php

    r754930 r810006  
    116116        $this->_config_master = new W3_Config(true); 
    117117        $this->_config_admin = w3_instance('W3_ConfigAdmin'); 
     118        w3_require_once(W3TC_LIB_W3_DIR . '/Request.php'); 
     119        w3_require_once(W3TC_INC_FUNCTIONS_DIR . '/admin.php'); 
     120        $this->_page = w3tc_get_current_page(); 
    118121    } 
    119122 
  • w3-total-cache/tags/0.9.3/lib/W3/UI/SupportAdminView.php

    r754930 r810006  
    8383    } 
    8484 
    85  
    86     /** 
     85/** 
    8786     * Support select action 
    8887     * 
     
    9089     */ 
    9190    function action_support_select() { 
    92         include W3TC_INC_DIR . '/options/support/select.php'; 
     91        $admin = w3_instance('W3_AdminActions_SupportActionsAdmin'); 
     92        $admin->action_support_select(); 
     93    } 
     94 
     95    /** 
     96     * Support form action 
     97     * 
     98     * @return void 
     99     */ 
     100    function action_support_form() { 
     101        $admin = w3_instance('W3_AdminActions_SupportActionsAdmin'); 
     102        $admin->action_support_form(); 
    93103    } 
    94104} 
  • w3-total-cache/tags/0.9.3/readme.txt

    r754930 r810006  
    33Tags: wpo, web performance optimization, performance, availability, scaling, scalability, user experience, cache, caching, page cache, css cache, js cache, db cache, disk cache, disk caching, database cache, http compression, gzip, deflate, minify, cdn, content delivery network, media library, performance, speed, multiple hosts, css, merge, combine, unobtrusive javascript, compress, optimize, optimizer, javascript, js, cascading style sheet, plugin, yslow, yui, google, google rank, google page speed, mod_pagespeed, new relic, newrelic, aws, s3, cloudfront, sns, elasticache, rds, flash media server, amazon web services, cloud files, rackspace, akamai, max cdn, netdna, limelight, cloudflare, mod_cloudflare, microsoft, microsoft azure, iis, nginx, litespeed, apache, varnish, xcache, apc, eacclerator, wincache, mysql, w3 total cache, batcache, wp cache, wp super cache, quick cache, wp minify, bwp-minify, buddypress 
    44Requires at least: 3.2 
    5 Tested up to: 3.5.1 
     5Tested up to: 3.7.1 
    66Stable tag: 0.9.3 
    77License: GPLv2 or later 
Note: See TracChangeset for help on using the changeset viewer.