Userguide tweaks to show proper PHP 5 examples and removing the compat helper from the menu.
diff --git a/user_guide/general/controllers.html b/user_guide/general/controllers.html
index bcd0e4b..1d9cd03 100644
--- a/user_guide/general/controllers.html
+++ b/user_guide/general/controllers.html
@@ -340,7 +340,7 @@
<br />
function <kbd>__construct()</kbd><br />
{<br />
- <var>parent::CI_Controller();</var><br />
+ <var>parent::__construct();</var><br />
// Your own constructor code<br />
}<br />
}<br />
diff --git a/user_guide/general/core_classes.html b/user_guide/general/core_classes.html
index ac965ae..35043d9 100644
--- a/user_guide/general/core_classes.html
+++ b/user_guide/general/core_classes.html
@@ -131,9 +131,9 @@
<code>
class MY_Input extends CI_Input {<br />
<br />
- function MY_Input()<br />
+ function __construct()<br />
{<br />
- parent::CI_Input();<br />
+ parent::__construct();<br />
}<br />
}</code>
@@ -145,9 +145,9 @@
<code>class Welcome extends MY_Controller {<br />
<br />
- function Welcome()<br />
+ function __construct()<br />
{<br />
- parent::MY_Controller();<br />
+ parent::__construct();<br />
}<br />
<br />
function index()<br />
diff --git a/user_guide/general/creating_libraries.html b/user_guide/general/creating_libraries.html
index 3f0e32c..00d0f4a 100644
--- a/user_guide/general/creating_libraries.html
+++ b/user_guide/general/creating_libraries.html
@@ -141,7 +141,7 @@
<br />
class Someclass {<br />
<br />
- function Someclass($params)<br />
+ function __construct($params)<br />
{<br />
// Do something with $params<br />
}<br />
@@ -248,9 +248,9 @@
<code>
class MY_Email extends CI_Email {<br />
<br />
- function My_Email()<br />
+ function __construct()<br />
{<br />
- parent::CI_Email();<br />
+ parent::__construct();<br />
}<br />
}</code>
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index 35ab08d..4669966 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -83,10 +83,10 @@
var $content = '';<br />
var $date = '';<br />
<br />
- function Blogmodel()<br />
+ function __construct()<br />
{<br />
// Call the Model constructor<br />
- parent::CI_Model();<br />
+ parent::__construct();<br />
}<br />
<br />
function get_last_ten_entries()<br />
@@ -128,9 +128,9 @@
<code>
class <var>Model_name</var> extends CI_Model {<br />
<br />
- function <var>Model_name</var>()<br />
+ function <var>__construct</var>()<br />
{<br />
- parent::CI_Model();<br />
+ parent::__construct();<br />
}<br />
}</code>
@@ -142,9 +142,9 @@
<code>
class <var>User_model</var> extends CI_Model {<br />
<br />
- function <var>User_model</var>()<br />
+ function <var>__construct</var>()<br />
{<br />
- parent::CI_Model();<br />
+ parent::__construct();<br />
}<br />
}</code>
diff --git a/user_guide/general/styleguide.html b/user_guide/general/styleguide.html
index 7b7d837..f30f455 100644
--- a/user_guide/general/styleguide.html
+++ b/user_guide/general/styleguide.html
@@ -161,7 +161,7 @@
<h2><a name="class_and_method_naming"></a>Class and Method Naming</h2>
<div class="guidelineDetails">
- <p>Class names should always have their first letter uppercase, and the constructor method should match identically. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.</p>
+ <p>Class names should always start with an uppercase letter. Multiple words should be separated with an underscore, and not CamelCased. All other class methods should be entirely lowercased and named to clearly indicate their function, preferably including a verb. Try to avoid overly long and verbose names.</p>
<code><strong>INCORRECT</strong>:
class superclass
@@ -170,11 +170,10 @@
<strong>CORRECT</strong>:
class Super_class</code>
- <p>Notice that the Class and constructor methods are identically named and cased:</p>
<code>class Super_class {
- function Super_class()
+ function __construct()
{
}