summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-10-13 23:44:17 +0200
committeradmin <devnull@localhost>2006-10-13 23:44:17 +0200
commitb06d69f03f5149877390d7e99882006a141268ff (patch)
tree0d39c4fd2909649a5673af47e4b62a3afc2b629e
parent5a14ea1599841bdaac15b45e3efd4cba01601f49 (diff)
-rw-r--r--system/codeigniter/Common.php4
-rw-r--r--system/libraries/Profiler.php15
-rw-r--r--system/libraries/Session.php18
-rw-r--r--user_guide/changelog.html2
-rw-r--r--user_guide/general/errors.html8
-rw-r--r--user_guide/general/models.html5
6 files changed, 23 insertions, 29 deletions
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index 8ac80d634..07b468fef 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -204,7 +204,7 @@ function log_message($level = 'error', $message, $php_error = FALSE)
static $LOG;
$config = get_config();
- if ($config['log_errors'] === FALSE)
+ if ($config['log_threshold'] == 0)
{
return;
}
@@ -255,7 +255,7 @@ function _exception_handler($severity, $message, $filepath, $line)
// Should we log the error? No? We're done...
$config = get_config();
- if ($config['log_errors'] === FALSE)
+ if ($config['log_threshold'] == 0)
{
return;
}
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 3370c9113..7fecabd21 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -94,7 +94,12 @@ class CI_Profiler {
// --------------------------------------------------------------------
-
+ /**
+ * Compile Queries
+ *
+ * @access private
+ * @return string
+ */
function _compile_queries()
{
$output = "\n\n";
@@ -130,7 +135,13 @@ class CI_Profiler {
}
// --------------------------------------------------------------------
-
+
+ /**
+ * Compile $_POST Data
+ *
+ * @access private
+ * @return string
+ */
function _compile_post()
{
$output = "\n\n";
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 16f373fd0..8390fd6d4 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -112,10 +112,8 @@ class CI_Session {
}
}
- // Do we need encryption?
- $this->encryption = $this->CI->config->item('sess_encrypt_cookie');
-
- if ($this->encryption == TRUE)
+ // Do we need encryption?
+ if ($this->CI->config->item('sess_encrypt_cookie') == TRUE)
{
$this->CI->load->library('encrypt');
}
@@ -160,7 +158,6 @@ class CI_Session {
$this->sess_gc();
}
}
- // END sess_run()
// --------------------------------------------------------------------
@@ -257,7 +254,6 @@ class CI_Session {
return TRUE;
}
- // END sess_read()
// --------------------------------------------------------------------
@@ -285,7 +281,6 @@ class CI_Session {
0
);
}
- // END sess_read()
// --------------------------------------------------------------------
@@ -321,7 +316,6 @@ class CI_Session {
$this->userdata['last_visit'] = 0;
$this->sess_write();
}
- // END sess_read()
// --------------------------------------------------------------------
@@ -349,7 +343,6 @@ class CI_Session {
// Write the cookie
$this->sess_write();
}
- // END sess_update()
// --------------------------------------------------------------------
@@ -370,7 +363,6 @@ class CI_Session {
0
);
}
- // END sess_destroy()
// --------------------------------------------------------------------
@@ -396,7 +388,6 @@ class CI_Session {
log_message('debug', 'Session garbage collection performed.');
}
}
- // END sess_destroy()
// --------------------------------------------------------------------
@@ -411,7 +402,6 @@ class CI_Session {
{
return ( ! isset($this->userdata[$item])) ? FALSE : $this->userdata[$item];
}
- // END sess_destroy()
// --------------------------------------------------------------------
@@ -440,7 +430,6 @@ class CI_Session {
$this->sess_write();
}
- // END set_userdata()
// --------------------------------------------------------------------
@@ -467,7 +456,6 @@ class CI_Session {
$this->sess_write();
}
- // END set_userdata()
// --------------------------------------------------------------------
@@ -494,7 +482,7 @@ class CI_Session {
return $vals;
}
- // END strip_slashes()
+
}
// END Session Class
?> \ No newline at end of file
diff --git a/user_guide/changelog.html b/user_guide/changelog.html
index 4407b7f14..75d3838f3 100644
--- a/user_guide/changelog.html
+++ b/user_guide/changelog.html
@@ -91,7 +91,7 @@ Change Log
<li>Fixed a bug in the validation class.</li>
<li><strong>Deprecated "init" folder</strong>. Initialization happens automatically now. <a href="creating_libraries.html">Please see documentation</a>.</li>
<li><strong>Deprecated</strong> $this->db->field_names() USE $this->db->list_fields()</li>
-
+<li><strong>Deprecated</strong> the <dfn>$config['log_errors']</dfn> item from the config.php file. Instead, <dfn>$config['log_threshold']</dfn> can be set to "0" to turn it off.</li>
</ul>
diff --git a/user_guide/general/errors.html b/user_guide/general/errors.html
index 8d2cbe55c..a2626ab30 100644
--- a/user_guide/general/errors.html
+++ b/user_guide/general/errors.html
@@ -116,10 +116,10 @@ log_message('info', 'The purpose of some variable is to provide some value.');<b
</ol>
-<p class="important"><strong>Note:</strong> In order for the log file to actually be written, the "log_errors"
-option must be enabled in your <kbd>application/config/config.php</kbd> file, and the "logs" folder must be writable.
-In addition, you'll can set the "threshold" for logging.
-You might, for example, only want error messages to be logged, and not the other two types.</p>
+<p class="important"><strong>Note:</strong> In order for the log file to actually be written, the
+ "logs" folder must be writable. In addition, you must set the "threshold" for logging.
+You might, for example, only want error messages to be logged, and not the other two types.
+If you set it to zero logging will be disabled.</p>
diff --git a/user_guide/general/models.html b/user_guide/general/models.html
index 168aee8bc..3009e505c 100644
--- a/user_guide/general/models.html
+++ b/user_guide/general/models.html
@@ -240,11 +240,6 @@ and connectivity settings, as defined in your database config file will be used:
</ul>
-
-
-
-
-
</div>
<!-- END CONTENT -->