diff --git a/administrator/components/com_config/views/application/tmpl/default_cache.php b/administrator/components/com_config/views/application/tmpl/default_cache.php index ad3a7bbd1b83b..2869ed0f4955a 100644 --- a/administrator/components/com_config/views/application/tmpl/default_cache.php +++ b/administrator/components/com_config/views/application/tmpl/default_cache.php @@ -21,7 +21,12 @@ - data['cache_handler']) && $this->data['cache_handler'] == 'memcache' || $this->data['session_handler'] == 'memcache') : ?> + data['cache_handler']) && + $this->data['cache_handler'] == 'memcache' || + $this->data['session_handler'] == 'memcache' || + $this->data['cache_handler'] == 'memcached' || + $this->data['session_handler'] == 'memcached' + ) : ?> form->getFieldset('memcache') as $mfield): diff --git a/administrator/language/en-GB/en-GB.com_config.ini b/administrator/language/en-GB/en-GB.com_config.ini index ad57f7af43e80..0515696595cc9 100644 --- a/administrator/language/en-GB/en-GB.com_config.ini +++ b/administrator/language/en-GB/en-GB.com_config.ini @@ -111,14 +111,14 @@ COM_CONFIG_FIELD_MAIL_SMTP_SECURE_DESC="Select the security model that your SMTP COM_CONFIG_FIELD_MAIL_SMTP_SECURE_LABEL="SMTP Security" COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_DESC="Enter the username for access to the SMTP host." COM_CONFIG_FIELD_MAIL_SMTP_USERNAME_LABEL="SMTP Username" -COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC="Memcache Compression" -COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL="Memcache Compression" -COM_CONFIG_FIELD_MEMCACHE_HOST_DESC="Memcache Server Host" -COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL="Memcache Server Host" -COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC="Persistent Memcache" -COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL="Persistent Memcache" -COM_CONFIG_FIELD_MEMCACHE_PORT_DESC="Memcache Server Port" -COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL="Memcache Server Port" +COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_DESC="Memcache(d) Compression" +COM_CONFIG_FIELD_MEMCACHE_COMPRESSION_LABEL="Memcache(d) Compression" +COM_CONFIG_FIELD_MEMCACHE_HOST_DESC="Memcache(d) Server Host" +COM_CONFIG_FIELD_MEMCACHE_HOST_LABEL="Memcache(d) Server Host" +COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_DESC="Persistent Memcache(d)" +COM_CONFIG_FIELD_MEMCACHE_PERSISTENT_LABEL="Persistent Memcache(d)" +COM_CONFIG_FIELD_MEMCACHE_PORT_DESC="Memcache(d) Server Port" +COM_CONFIG_FIELD_MEMCACHE_PORT_LABEL="Memcache(d) Server Port" COM_CONFIG_FIELD_METAAUTHOR_DESC="Show the author meta tag when viewing articles" COM_CONFIG_FIELD_METAAUTHOR_LABEL="Show Author Meta Tag" COM_CONFIG_FIELD_METADESC_DESC="Enter a description of the overall Web site that is to be used by search engines. Generally, a maximum of 20 words is optimal." diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini index f64e7f3b0798f..79d6bf200ed14 100644 --- a/administrator/language/en-GB/en-GB.lib_joomla.ini +++ b/administrator/language/en-GB/en-GB.lib_joomla.ini @@ -297,12 +297,14 @@ JLIB_FORM_VALUE_CACHE_CACHELITE="Cache_Lite" JLIB_FORM_VALUE_CACHE_EACCELERATOR="eAccelerator" JLIB_FORM_VALUE_CACHE_FILE="File" JLIB_FORM_VALUE_CACHE_MEMCACHE="Memcache" +JLIB_FORM_VALUE_CACHE_MEMCACHED="Memcached (Experimental)" JLIB_FORM_VALUE_CACHE_WINCACHE="Windows Cache" JLIB_FORM_VALUE_CACHE_XCACHE="XCache" JLIB_FORM_VALUE_SESSION_APC="Alternative PHP Cache" JLIB_FORM_VALUE_SESSION_DATABASE="Database" JLIB_FORM_VALUE_SESSION_EACCELERATOR="eAccelerator" JLIB_FORM_VALUE_SESSION_MEMCACHE="Memcache" +JLIB_FORM_VALUE_SESSION_MEMCACHED="Memcached (Experimental)" JLIB_FORM_VALUE_SESSION_NONE="None" JLIB_FORM_VALUE_SESSION_WINCACHE="Windows Cache" JLIB_FORM_VALUE_SESSION_XCACHE="XCache" diff --git a/installation/CHANGELOG b/installation/CHANGELOG index d31631a4e3586..2b34ef2c46cfd 100644 --- a/installation/CHANGELOG +++ b/installation/CHANGELOG @@ -30,6 +30,7 @@ $ -> Language fix or change # [#29082] using unicode slugs broken in master ^ Merge latest platform (c4940fab81c79d618c52f915dc71c66f0db3b25f) # [#29070] Bootstrapping Flash Uploader and Copy Template. Thanks Kyle. + + [#27979] PHP Memcached driver. Thanks Ofer. 05-Sept-2012 Jean-Marie Simonet # [#29009] Drop the unused usertype column from #__users and #__sessions. Thanks Michael diff --git a/language/en-GB/en-GB.lib_joomla.ini b/language/en-GB/en-GB.lib_joomla.ini index bf995e7803fcf..5805a28952b33 100644 --- a/language/en-GB/en-GB.lib_joomla.ini +++ b/language/en-GB/en-GB.lib_joomla.ini @@ -297,12 +297,14 @@ JLIB_FORM_VALUE_CACHE_CACHELITE="Cache_Lite" JLIB_FORM_VALUE_CACHE_EACCELERATOR="eAccelerator" JLIB_FORM_VALUE_CACHE_FILE="File" JLIB_FORM_VALUE_CACHE_MEMCACHE="Memcache" +JLIB_FORM_VALUE_CACHE_MEMCACHED="Memcached (Experimental)" JLIB_FORM_VALUE_CACHE_WINCACHE="Windows Cache" JLIB_FORM_VALUE_CACHE_XCACHE="XCache" JLIB_FORM_VALUE_SESSION_APC="Alternative PHP Cache" JLIB_FORM_VALUE_SESSION_DATABASE="Database" JLIB_FORM_VALUE_SESSION_EACCELERATOR="eAccelerator" JLIB_FORM_VALUE_SESSION_MEMCACHE="Memcache" +JLIB_FORM_VALUE_SESSION_MEMCACHED="Memcached (Experimental)" JLIB_FORM_VALUE_SESSION_NONE="None" JLIB_FORM_VALUE_SESSION_WINCACHE="Windows Cache" JLIB_FORM_VALUE_SESSION_XCACHE="XCache"