From 25f119cef588a01651cec7c59d3b03924b2dd81c Mon Sep 17 00:00:00 2001 From: darwinel Date: Tue, 11 Feb 2014 18:29:58 +0100 Subject: Writing style fix based on style guide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit „Use of || is discouraged as its clarity on some output devices is low (looking like the number 11 for instance). && is preferred over AND but either are acceptable, and a space should always precede and follow !.” --- user_guide_src/source/libraries/xmlrpc.rst | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/user_guide_src/source/libraries/xmlrpc.rst b/user_guide_src/source/libraries/xmlrpc.rst index 2cf548750..115b4e680 100644 --- a/user_guide_src/source/libraries/xmlrpc.rst +++ b/user_guide_src/source/libraries/xmlrpc.rst @@ -223,17 +223,17 @@ email address, etc.). Here is how the processing function might look:: $parameters = $request->output_parameters(); - if ($parameters['1'] != $username AND $parameters['2'] != $password) + if ($parameters['1'] != $username && $parameters['2'] != $password) { return $this->xmlrpc->send_error_message('100', 'Invalid Access'); } - $response = array(array('nickname' => array('Smitty','string'), - 'userid' => array('99','string'), - 'url' => array('http://yoursite.com','string'), - 'email' => array('jsmith@yoursite.com','string'), - 'lastname' => array('Smith','string'), - 'firstname' => array('John','string') + $response = array(array('nickname' => array('Smitty', 'string'), + 'userid' => array('99', 'string'), + 'url' => array('http://yoursite.com', 'string'), + 'email' => array('jsmith@yoursite.com', 'string'), + 'lastname' => array('Smith', 'string'), + 'firstname' => array('John', 'string') ), 'struct'); -- cgit v1.2.3-24-g4f1b From d8bef8a878238c6974f01758469af1c13ac8b8d7 Mon Sep 17 00:00:00 2001 From: darwinel Date: Tue, 11 Feb 2014 20:13:22 +0100 Subject: "BASEPATH check" consistency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As described in issue #2870 + A change in the „How to create a library” example in the user_guide --- application/config/autoload.php | 3 ++- application/config/config.php | 3 ++- application/config/constants.php | 3 ++- application/config/database.php | 4 +++- application/config/doctypes.php | 3 ++- application/config/foreign_chars.php | 3 ++- application/config/hooks.php | 3 ++- application/config/memcached.php | 3 ++- application/config/migration.php | 3 ++- application/config/mimes.php | 3 ++- application/config/profiler.php | 3 ++- application/config/routes.php | 3 ++- application/config/smileys.php | 3 ++- application/config/user_agents.php | 3 ++- user_guide_src/source/general/creating_libraries.rst | 3 ++- 15 files changed, 31 insertions(+), 15 deletions(-) diff --git a/application/config/autoload.php b/application/config/autoload.php index 3bf999e99..f3ae942a2 100644 --- a/application/config/autoload.php +++ b/application/config/autoload.php @@ -1,4 +1,4 @@ - '', diff --git a/application/config/foreign_chars.php b/application/config/foreign_chars.php index 07fc1785b..e151364ad 100644 --- a/application/config/foreign_chars.php +++ b/application/config/foreign_chars.php @@ -1,4 +1,4 @@ -