diff --git a/sites/all/README.txt b/sites/all/README.txt
index 7166d37..e549030 100644
--- a/sites/all/README.txt
+++ b/sites/all/README.txt
@@ -1,3 +1,4 @@
+// $Id: README.txt,v 1.3 2006/12/23 15:35:51 dries Exp $
 
 This directory should be used to place downloaded and custom modules
 and themes which are common to all sites. This will allow you to
diff --git a/sites/all/modules/cck/includes/views/handlers/content_handler_field.inc b/sites/all/modules/cck/includes/views/handlers/content_handler_field.inc
index 08576b8..db3cb50 100644
--- a/sites/all/modules/cck/includes/views/handlers/content_handler_field.inc
+++ b/sites/all/modules/cck/includes/views/handlers/content_handler_field.inc
@@ -18,7 +18,7 @@ class content_handler_field extends views_handler_field_node {
     $this->content_field = content_fields($this->definition['content_field_name']);
   }
 
-  function init(&$view, $options) {
+   function init(&$view, $options) {
     $field = $this->content_field;
     parent::init($view, $options);
     if ($field['multiple']) {
@@ -137,7 +137,8 @@ class content_handler_field extends views_handler_field_node {
   /**
    * Return DIV or SPAN based upon the field's element type.
    */
-  function element_type($none_supported = FALSE, $default_empty = FALSE) {
+ 
+  function element_type($none_supported = FALSE, $default_empty = FALSE, $inline = FALSE) {
     // The 'element_type' property denotes Views 3.x ('semantic views'
     // functionnality). If the property is set, and not set to '' ("default"),
     // let the generic method handle the output.
diff --git a/sites/all/modules/cck/includes/views/handlers/content_handler_field_multiple.inc b/sites/all/modules/cck/includes/views/handlers/content_handler_field_multiple.inc
index 4815e97..d9dc3ff 100644
--- a/sites/all/modules/cck/includes/views/handlers/content_handler_field_multiple.inc
+++ b/sites/all/modules/cck/includes/views/handlers/content_handler_field_multiple.inc
@@ -191,7 +191,8 @@ class content_handler_field_multiple extends content_handler_field {
    * Fields rendered with the 'group multiple' option use <div> markers,
    * and thus shouldn't be wrapped in a <span>.
    */
-  function element_type($none_supported = FALSE, $default_empty = FALSE) {
+  // -- nk. function element_type($none_supported = FALSE, $default_empty = FALSE) {
+  function element_type($none_supported = FALSE, $default_empty = FALSE, $inline = FALSE) {
     // If this is not a grouped field, use the parent method.
     if (!$this->defer_query) {
       return parent::element_type($none_supported, $default_empty);
diff --git a/sites/all/modules/views/handlers/views_handler_argument.inc b/sites/all/modules/views/handlers/views_handler_argument.inc
index 05644cf..27cfdf7 100644
--- a/sites/all/modules/views/handlers/views_handler_argument.inc
+++ b/sites/all/modules/views/handlers/views_handler_argument.inc
@@ -45,7 +45,7 @@ class views_handler_argument extends views_handler {
     }
   }
 
-  function init(&$view, &$options) {
+  function init(&$view, $options) {
     parent::init($view, $options);
   }
 
diff --git a/sites/all/modules/views/handlers/views_handler_argument_many_to_one.inc b/sites/all/modules/views/handlers/views_handler_argument_many_to_one.inc
index cc887d4..d078e34 100644
--- a/sites/all/modules/views/handlers/views_handler_argument_many_to_one.inc
+++ b/sites/all/modules/views/handlers/views_handler_argument_many_to_one.inc
@@ -13,7 +13,7 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument_many_to_one extends views_handler_argument {
-  function init(&$view, &$options) {
+  function init(&$view, $options) {
     parent::init($view, $options);
     $this->helper = new views_many_to_one_helper($this);
 
diff --git a/sites/all/modules/views/handlers/views_handler_argument_string.inc b/sites/all/modules/views/handlers/views_handler_argument_string.inc
index ae7dd1e..5f13f53 100644
--- a/sites/all/modules/views/handlers/views_handler_argument_string.inc
+++ b/sites/all/modules/views/handlers/views_handler_argument_string.inc
@@ -7,7 +7,9 @@
  * @ingroup views_argument_handlers
  */
 class views_handler_argument_string extends views_handler_argument {
-  function init(&$view, &$options) {
+  //n.c code edit for  strict warning: Declaration of views_handler_argument_string::init() should be compatible with views_handler_argument::init(&$view, $options) in /var/www/OWNT/sites/all/modules/views/handlers/views_handler_argument_string.inc on line 241.old code is commented bellow 
+  //function init(&$view, &$options) {
+  function init(&$view, $options) {
     parent::init($view, $options);
     if (!empty($this->definition['many to one'])) {
       $this->helper = new views_many_to_one_helper($this);
diff --git a/sites/all/modules/views/handlers/views_handler_filter.inc b/sites/all/modules/views/handlers/views_handler_filter.inc
index 49b93e5..2718042 100644
--- a/sites/all/modules/views/handlers/views_handler_filter.inc
+++ b/sites/all/modules/views/handlers/views_handler_filter.inc
@@ -101,7 +101,7 @@ class views_handler_filter extends views_handler {
   /**
    * Simple validate handler
    */
-  function options_validate(&$form, &$form_state) {
+  function options_validate($form, &$form_state) {
     $this->operator_validate($form, $form_state);
     $this->value_validate($form, $form_state);
     if (!empty($this->options['exposed'])) {
@@ -113,7 +113,7 @@ class views_handler_filter extends views_handler {
   /**
    * Simple submit handler
    */
-  function options_submit(&$form, &$form_state) {
+  function options_submit($form, &$form_state) {
     unset($form_state['values']['expose_button']); // don't store this.
     $this->operator_submit($form, $form_state);
     $this->value_submit($form, $form_state);
diff --git a/sites/all/modules/views/handlers/views_handler_filter_boolean_operator.inc b/sites/all/modules/views/handlers/views_handler_filter_boolean_operator.inc
index c2ec624..2c4c510 100644
--- a/sites/all/modules/views/handlers/views_handler_filter_boolean_operator.inc
+++ b/sites/all/modules/views/handlers/views_handler_filter_boolean_operator.inc
@@ -107,8 +107,8 @@ class views_handler_filter_boolean_operator extends views_handler_filter {
       }
     }
   }
-
-  function value_validate(&$form, &$form_state) {
+//n.c code edit due to e strict warning  old code was  value_validate($form, &$form_state) 
+  function value_validate($form, &$form_state) {
     if ($form_state['values']['options']['value'] == 'All' && empty($form_state['values']['options']['expose']['optional'])) {
       form_set_error('value', t('You must select a value unless this is an optional exposed filter.'));
     }
diff --git a/sites/all/modules/views/handlers/views_handler_filter_date.inc b/sites/all/modules/views/handlers/views_handler_filter_date.inc
index 356ec78..ab25862 100644
--- a/sites/all/modules/views/handlers/views_handler_filter_date.inc
+++ b/sites/all/modules/views/handlers/views_handler_filter_date.inc
@@ -31,7 +31,7 @@ class views_handler_filter_date extends views_handler_filter_numeric {
     parent::value_form($form, $form_state);
   }
 
-  function options_validate(&$form, &$form_state) {
+  function options_validate($form, &$form_state) {
     parent::options_validate($form, $form_state);
 
     if (!empty($form_state['values']['options']['expose']['optional'])) {
@@ -42,7 +42,7 @@ class views_handler_filter_date extends views_handler_filter_numeric {
     $this->validate_valid_time($form['value'], $form_state['values']['options']['operator'], $form_state['values']['options']['value']);
   }
 
-  function exposed_validate(&$form, &$form_state) {
+  function exposed_validate($form, &$form_state) {
     if (empty($this->options['exposed'])) {
       return;
     }
diff --git a/sites/all/modules/views/includes/handlers.inc b/sites/all/modules/views/includes/handlers.inc
index edfdccd..b9216ab 100644
--- a/sites/all/modules/views/includes/handlers.inc
+++ b/sites/all/modules/views/includes/handlers.inc
@@ -514,9 +514,9 @@ class views_many_to_one_helper {
     $this->handler = &$handler;
   }
 
-  function option_definition(&$options) {
-    $options['reduce_duplicates'] = array('default' => FALSE);
-  }
+public static function option_definition(&$options) {
+     $options['reduce_duplicates'] = array('default' => FALSE);
+   }
 
   function options_form(&$form, &$form_state) {
     $form['reduce_duplicates'] = array(
diff --git a/sites/all/modules/views/includes/view.inc b/sites/all/modules/views/includes/view.inc
index c58b43f..0840f81 100644
--- a/sites/all/modules/views/includes/view.inc
+++ b/sites/all/modules/views/includes/view.inc
@@ -91,9 +91,9 @@ class view extends views_db_object {
    * Note: In PHP5 this should be static, but PHP4 doesn't support static
    * methods.
    */
-  function db_objects() {
-    return array('display');
-  }
+ public static function db_objects() {
+     return array('display');
+   }
 
   /**
    * Set the arguments that come to this view. Usually from the URL
@@ -1339,7 +1339,7 @@ class view extends views_db_object {
    *  If TRUE, reset this entry in the load cache.
    * @return A view object or NULL if it was not available.
    */
-  function &load($arg, $reset = FALSE) {
+ public static function &load($arg, $reset = FALSE) {
     static $cache = array();
 
     // We want a NULL value to return TRUE here, so we can't use isset() or empty().
@@ -1392,7 +1392,7 @@ class view extends views_db_object {
    * that would be very slow.  Buiding the views externally from unified queries is
    * much faster.
    */
-  function load_views() {
+  public static function load_views() {
     $result = db_query("SELECT DISTINCT v.* FROM {views_view} v");
     $views = array();
     $vids = array();
diff --git a/sites/all/modules/views/modules/comment/views_handler_field_comment.inc b/sites/all/modules/views/modules/comment/views_handler_field_comment.inc
index 6755b14..c1b2e91 100644
--- a/sites/all/modules/views/modules/comment/views_handler_field_comment.inc
+++ b/sites/all/modules/views/modules/comment/views_handler_field_comment.inc
@@ -6,7 +6,10 @@ class views_handler_field_comment extends views_handler_field {
   /**
    * Override init function to provide generic option to link to comment.
    */
-  function init(&$view, &$options) {
+
+  //  n.c code edit  for warning strict warning: Declaration of views_handler_field_comment::init() should be compatible with views_handler_field::init(&$view, $options) in /var/www/OWNT/sites/all/modules/views/modules/comment/views_handler_field_comment.inc on line 49.
+  //function init(&$view, &$options)
+  function init(&$view, $options) {
     parent::init($view, $options);
     if (!empty($this->options['link_to_comment'])) {
       $this->additional_fields['cid'] = 'cid';
diff --git a/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc b/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc
index a67612a..9e01978 100644
--- a/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc
+++ b/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc
@@ -6,7 +6,8 @@ class views_handler_field_comment_username extends views_handler_field {
   /**
    * Override init function to add uid and homepage fields.
    */
-  function init(&$view, &$data) {
+  //n.c edit to solve strict warning: Declaration of views_handler_field_comment_username::init() should be compatible with views_handler_field::init(&$view, $options) in /var/www/OWNT/sites/all/modules/views/modules/comment/views_handler_field_comment_username.inc on line 48.  previous code was   function init(&$view, &$data)
+  function init(&$view, $data) {
     parent::init($view, $data);
     $this->additional_fields['uid'] = 'uid';
     $this->additional_fields['homepage'] = 'homepage';
diff --git a/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc b/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc
index f724c12..9367cae 100644
--- a/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc
+++ b/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc
@@ -45,7 +45,9 @@ class views_handler_field_node_new_comments extends views_handler_field_numeric
     $this->field_alias = $this->table . '_' . $this->field;
   }
 
-  function pre_render(&$values) {
+   // n.c code to remove strict warning: Declaration of views_handler_field_node_new_comments::pre_render() should be compatible with views_handler_field::pre_render($values) in /var/www/OWNT/sites/all/modules/views/modules/comment/views_handler_field_node_new_comments.inc on line 102. old code is commented bellow  
+  //function pre_render(&$values) {
+  function pre_render($values) {
     global $user;
     if (!$user->uid || empty($values)) {
       return;
diff --git a/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc b/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc
index bc8fc92..24d629c 100644
--- a/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc
+++ b/sites/all/modules/views/modules/taxonomy/views_handler_field_term_node_tid.inc
@@ -66,6 +66,9 @@ class views_handler_field_term_node_tid extends views_handler_field_prerender_li
     $this->add_additional_fields();
   }
 
+
+  // n.c solved strict warning previous code change  function pre_render(&$values)
+
   function pre_render($values) {
     $this->field_alias = $this->aliases['vid'];
     $vids = array();
diff --git a/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc b/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
index 2158965..68de751 100644
--- a/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
+++ b/sites/all/modules/views/modules/taxonomy/views_handler_filter_term_node_tid.inc
@@ -172,8 +172,8 @@ class views_handler_filter_term_node_tid extends views_handler_filter_many_to_on
       $this->helper->options_form($form, $form_state);
     }
   }
-
-  function value_validate(&$form, &$form_state) {
+// n.c code edited previous code was function value_validate(&$form, &$form_state)
+  function value_validate($form, &$form_state) {
     // We only validate if they've chosen the text field style.
     if ($this->options['type'] != 'textfield') {
       return;
diff --git a/sites/all/modules/views/modules/upload/views_handler_field_upload_description.inc b/sites/all/modules/views/modules/upload/views_handler_field_upload_description.inc
index 964925c..d5c988c 100644
--- a/sites/all/modules/views/modules/upload/views_handler_field_upload_description.inc
+++ b/sites/all/modules/views/modules/upload/views_handler_field_upload_description.inc
@@ -4,7 +4,11 @@
  * Field handler to provide a list of roles.
  */
 class views_handler_field_upload_description extends views_handler_field {
-  function init(&$view, &$options) {
+
+  //n.c code edit for strict warning strict warning: Declaration of views_handler_field_upload_description::init() should be compatible with views_handler_field::init(&$view, $options) in /var/www/OWNT/sites/all/modules/views/modules/upload/views_handler_field_upload_description.inc on line 72.
+  
+  //function init(&$view, &$options)
+  function init(&$view, $options) {
     parent::init($view, $options);
     if (!empty($options['link_to_file'])) {
       $this->additional_fields['fid'] = 'fid';
diff --git a/sites/all/modules/views/modules/user/views_handler_field_user.inc b/sites/all/modules/views/modules/user/views_handler_field_user.inc
index de8c6e6..5b934df 100644
--- a/sites/all/modules/views/modules/user/views_handler_field_user.inc
+++ b/sites/all/modules/views/modules/user/views_handler_field_user.inc
@@ -7,7 +7,8 @@ class views_handler_field_user extends views_handler_field {
   /**
    * Override init function to provide generic option to link to user.
    */
-  function init(&$view, &$data) {
+  
+  function init(&$view, $data) {
     parent::init($view, $data);
     if (!empty($this->options['link_to_user'])) {
       $this->additional_fields['uid'] = 'uid';
diff --git a/sites/all/modules/views/plugins/views_plugin_row.inc b/sites/all/modules/views/plugins/views_plugin_row.inc
index 06d0930..2fe3ae4 100644
--- a/sites/all/modules/views/plugins/views_plugin_row.inc
+++ b/sites/all/modules/views/plugins/views_plugin_row.inc
@@ -98,13 +98,13 @@ class views_plugin_row extends views_plugin {
   /**
    * Validate the options form.
    */
-  function options_validate($form, &$form_state) { }
+  function options_validate(&$form, &$form_state) { }
 
   /**
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit($form, &$form_state) { }
+  function options_submit(&$form, &$form_state) { }
 
   function query() {
     if (isset($this->base_table) && isset($this->options['relationship']) && isset($this->view->relationship[$this->options['relationship']])) {
diff --git a/sites/all/modules/views/plugins/views_plugin_row_fields.inc b/sites/all/modules/views/plugins/views_plugin_row_fields.inc
index 491f5d2..bd66b42 100644
--- a/sites/all/modules/views/plugins/views_plugin_row_fields.inc
+++ b/sites/all/modules/views/plugins/views_plugin_row_fields.inc
@@ -60,7 +60,7 @@ class views_plugin_row_fields extends views_plugin_row {
    * Perform any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
-  function options_submit($form, &$form_state) {
+  function options_submit(&$form, &$form_state) {
     $form_state['values']['row_options']['inline'] = array_filter($form_state['values']['row_options']['inline']);
   }
 }
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 70c6480..ce2c3a8 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -1,4 +1,5 @@
 <?php
+// $Id: default.settings.php,v 1.8.2.4 2009/09/14 12:59:18 goba Exp $
 
 /**
  * @file
@@ -92,26 +93,6 @@ $db_url = 'mysql://username:password@localhost/databasename';
 $db_prefix = '';
 
 /**
- * Database default collation.
- *
- * All data stored in Drupal is in UTF-8. Certain databases, such as MySQL,
- * support different algorithms for comparing, indexing, and sorting characters;
- * a so called "collation". The default collation of a database normally works
- * for many use-cases, but depending on the language(s) of the stored data, it
- * may be necessary to use a different collation.
- * Important:
- * - Only set or change this value BEFORE installing Drupal, unless you know
- *   what you are doing.
- * - All database tables and columns should be in the same collation. Otherwise,
- *   string comparisons performed for table JOINs will be significantly slower.
- * - Especially when storing data in German or Russian on MySQL 5.1+, you want
- *   to use the 'utf8_unicode_ci' collation instead.
- *
- * @see http://drupal.org/node/772678
- */
-# $db_collation = 'utf8_general_ci';
-
-/**
  * Access control for update.php script
  *
  * If you are updating your Drupal installation using the update.php script