summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2014-12-04 10:51:55 +0100
committerAndrey Andreev <narf@devilix.net>2014-12-04 10:51:55 +0100
commit61f17be68fca126effb7fff7780ca2fd10e7c4dc (patch)
treeb9cf228814fba6e68ea9039b8a504ed6d48d5583
parent309d7012a737f140076cabbe8873dc39f25331b2 (diff)
parent694d400efb077666955672c2e8c22e4d1b3a3a06 (diff)
Merge pull request #3388 from jim-parry/fix/deprecation
Flag the smiley helper and shopping cart as deprecated.
-rw-r--r--system/helpers/smiley_helper.php3
-rw-r--r--system/libraries/Cart.php1
-rw-r--r--user_guide_src/source/helpers/smiley_helper.rst4
-rw-r--r--user_guide_src/source/libraries/cart.rst4
-rw-r--r--user_guide_src/source/libraries/javascript.rst2
5 files changed, 12 insertions, 2 deletions
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php
index 20f3d4129..16b6c75a0 100644
--- a/system/helpers/smiley_helper.php
+++ b/system/helpers/smiley_helper.php
@@ -44,7 +44,8 @@ defined('BASEPATH') OR exit('No direct script access allowed');
* @subpackage Helpers
* @category Helpers
* @author EllisLab Dev Team
- * @link http://codeigniter.com/user_guide/helpers/smiley_helper.html
+ * @link http://codeigniter.com/user_guide/helpers/smilclass does not fit CI
+ * @deprecated 3.0.0 This class does not fit CI.
*/
// ------------------------------------------------------------------------
diff --git a/system/libraries/Cart.php b/system/libraries/Cart.php
index 14f08a8c3..686d563b0 100644
--- a/system/libraries/Cart.php
+++ b/system/libraries/Cart.php
@@ -45,6 +45,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
* @category Shopping Cart
* @author EllisLab Dev Team
* @link http://codeigniter.com/user_guide/libraries/cart.html
+ * @deprecated 3.0.0 This class does not fit CI
*/
class CI_Cart {
diff --git a/user_guide_src/source/helpers/smiley_helper.rst b/user_guide_src/source/helpers/smiley_helper.rst
index e7a5724a8..37dfdf664 100644
--- a/user_guide_src/source/helpers/smiley_helper.rst
+++ b/user_guide_src/source/helpers/smiley_helper.rst
@@ -2,6 +2,10 @@
Smiley Helper
#############
+.. important:: This library is DEPRECATED and should not be used.
+ It is now no longer supported.
+ Currently only kept for backwards compatibility.
+
The Smiley Helper file contains functions that let you manage smileys
(emoticons).
diff --git a/user_guide_src/source/libraries/cart.rst b/user_guide_src/source/libraries/cart.rst
index bedea4dbf..e06a4d127 100644
--- a/user_guide_src/source/libraries/cart.rst
+++ b/user_guide_src/source/libraries/cart.rst
@@ -2,6 +2,10 @@
Shopping Cart Class
###################
+.. important:: This library is DEPRECATED and should not be used.
+ It is now no longer supported.
+ Currently only kept for backwards compatibility.
+
The Cart Class permits items to be added to a session that stays active
while a user is browsing your site. These items can be retrieved and
displayed in a standard "shopping cart" format, allowing the user to
diff --git a/user_guide_src/source/libraries/javascript.rst b/user_guide_src/source/libraries/javascript.rst
index 9d0237e57..5ca12515c 100644
--- a/user_guide_src/source/libraries/javascript.rst
+++ b/user_guide_src/source/libraries/javascript.rst
@@ -2,7 +2,7 @@
Javascript Class
################
-.. note:: This library is DEPRECATED and should not be used. It has always
+.. important:: This library is DEPRECATED and should not be used. It has always
been with an 'experimental' status and is now no longer supported.
Currently only kept for backwards compatibility.