summaryrefslogtreecommitdiffstats
path: root/user_guide/helpers
diff options
context:
space:
mode:
authorPascal Kriete <pascal.kriete@ellislab.com>2010-11-10 22:41:28 +0100
committerPascal Kriete <pascal.kriete@ellislab.com>2010-11-10 22:41:28 +0100
commit1f2b3f06d951d949f5b565f0955e3e68d32008e2 (patch)
treec7a543f5dc851b54b585e13100a1dde855c07885 /user_guide/helpers
parent22f1a6380b292dbe9576b4015cbfbd09618ead5d (diff)
parente79d41a0de8a21db83fdb6b3e25ae65c9923c46d (diff)
Automated merge with http://hg.ellislab.com/CodeIgniterNoPhp4/
Diffstat (limited to 'user_guide/helpers')
-rw-r--r--user_guide/helpers/smiley_helper.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide/helpers/smiley_helper.html b/user_guide/helpers/smiley_helper.html
index d7c2d16e7..6846b78e7 100644
--- a/user_guide/helpers/smiley_helper.html
+++ b/user_guide/helpers/smiley_helper.html
@@ -101,9 +101,9 @@ your <dfn>smiley</dfn> folder.</p>
class Smileys extends CI_Controller {
- function Smileys()
+ function __construct()
{
- parent::CI_Controller();
+ parent::__construct();
}
function index()