Commits on Jul 1, 2010
  1. added localhost files dir to ignore

    B��r Kessels committed Jul 1, 2010
Commits on Mar 9, 2010
  1. redo of update. automated broke git merge, somehow.

    Bèr Kessels committed Mar 9, 2010
  2. merge with upstream

    diff --cc .gitignore
    index c7de89f,81be21e..abd2872
    --- a/.gitignore
    +++ b/.gitignore
    @@@ -1,1 -1,1 +1,5 @@@
    ++<<<<<<< HEAD:.gitignore
    +sites/yasmine
    ++=======
    + sites/default/settings.php
    ++>>>>>>> origin/master:.gitignore
    diff --cc CHANGELOG.txt
    index 8120d85,81b7dd8..1908bb8
    --- a/CHANGELOG.txt
    +++ b/CHANGELOG.txt
    @@@ -1,16 -1,4 +1,20 @@@
    ++<<<<<<< HEAD:CHANGELOG.txt
    +// $Id: CHANGELOG.txt,v 1.253.2.37 2010/03/04 00:15:28 goba Exp $
    +
    +Drupal 6.16, 2010-03-03
    +----------------------
    +- Fixed security issues (Installation cross site scripting, Open redirection,
    +  Locale module cross site scripting, Blocked user session regeneration),
    +  see SA-CORE-2010-001.
    +- Better support for updated jQuery versions.
    +- Reduced resource usage of update.module.
    +- Fixed several issues relating to support of install profiles and
    +  distributions.
    +- Added a locking framework to avoid data corruption on long operations.
    +- Fixed a variety of other bugs.
    ++=======
    + // $Id: CHANGELOG.txt,v 1.253.2.35 2009/12/16 20:47:10 goba Exp $
    ++>>>>>>> origin/master:CHANGELOG.txt
    
    Drupal 6.15, 2009-12-16
    ----------------------
    @@@ -218,11 -206,6 +222,14 @@@ Drupal 6.0, 2008-02-1
    - Removed old system updates. Updates from Drupal versions prior to 5.x will
    require upgrading to 5.x before upgrading to 6.x.
    
    ++<<<<<<< HEAD:CHANGELOG.txt
    +Drupal 5.22, 2010-03-03
    +-----------------------
    +- Fixed security issues (Open redirection, Locale module cross site scripting,
    +  Blocked user session regeneration), see SA-CORE-2010-001.
    +
    ++=======
    ++>>>>>>> origin/master:CHANGELOG.txt
    Drupal 5.21, 2009-12-16
    -----------------------
    - Fixed a security issue (Cross site scripting), see SA-CORE-2009-009.
    diff --cc includes/bootstrap.inc
    index 103b3ea,947852c..b949ce3
    --- a/includes/bootstrap.inc
    +++ b/includes/bootstrap.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/bootstrap.inc
    +// $Id: bootstrap.inc,v 1.206.2.14 2010/02/01 16:49:14 goba Exp $
    ++=======
    + // $Id: bootstrap.inc,v 1.206.2.13 2009/09/14 13:33:39 goba Exp $
    ++>>>>>>> origin/master:includes/bootstrap.inc
    
    /**
    * @file
    diff --cc includes/common.inc
    index e4b9848,536f94c..7c5ade7
    --- a/includes/common.inc
    +++ b/includes/common.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/common.inc
    +// $Id: common.inc,v 1.756.2.79 2010/03/04 00:15:28 goba Exp $
    ++=======
    + // $Id: common.inc,v 1.756.2.74 2009/12/16 20:47:10 goba Exp $
    ++>>>>>>> origin/master:includes/common.inc
    
    /**
    * @file
    diff --cc includes/database.inc
    index 0a68008,49cace2..0d8b30f
    --- a/includes/database.inc
    +++ b/includes/database.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/database.inc
    +// $Id: database.inc,v 1.92.2.9 2010/02/01 16:32:10 goba Exp $
    ++=======
    + // $Id: database.inc,v 1.92.2.8 2009/09/14 10:49:34 goba Exp $
    ++>>>>>>> origin/master:includes/database.inc
    
    /**
    * @file
    diff --cc includes/database.mysql-common.inc
    index b322c8b,2bb6408..c88ff09
    --- a/includes/database.mysql-common.inc
    +++ b/includes/database.mysql-common.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/database.mysql-common.inc
    +// $Id: database.mysql-common.inc,v 1.17.2.4 2010/03/01 10:37:30 goba Exp $
    ++=======
    + // $Id: database.mysql-common.inc,v 1.17.2.3 2009/09/14 10:49:34 goba Exp $
    ++>>>>>>> origin/master:includes/database.mysql-common.inc
    
    /**
    * @file
    diff --cc includes/database.mysql.inc
    index 45c03cf,b1cf774..7ca2e9e
    --- a/includes/database.mysql.inc
    +++ b/includes/database.mysql.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/database.mysql.inc
    +// $Id: database.mysql.inc,v 1.89.2.2 2010/02/01 16:32:10 goba Exp $
    ++=======
    + // $Id: database.mysql.inc,v 1.89.2.1 2009/07/21 08:52:29 goba Exp $
    ++>>>>>>> origin/master:includes/database.mysql.inc
    
    /**
    * @file
    @@@ -350,5 -350,30 +354,33 @@@ function db_column_exists($table, $colu
    }
    
    /**
    ++<<<<<<< HEAD:includes/database.mysql.inc
    ++=======
    +  * Wraps the given table.field entry with a DISTINCT(). The wrapper is added to
    +  * the SELECT list entry of the given query and the resulting query is returned.
    +  * This function only applies the wrapper if a DISTINCT doesn't already exist in
    +  * the query.
    +  *
    +  * @param $table Table containing the field to set as DISTINCT
    +  * @param $field Field to set as DISTINCT
    +  * @param $query Query to apply the wrapper to
    +  * @return SQL query with the DISTINCT wrapper surrounding the given table.field.
    +  */
    + function db_distinct_field($table, $field, $query) {
    +   $field_to_select = 'DISTINCT('. $table .'.'. $field .')';
    +   $matches = array();
    +   if (preg_match('/^SELECT(.*?)FROM(.*)/is', $query, $matches)) {
    +     $select = preg_replace(
    +       '/((?:^|,)\s*)(?<!DISTINCT\()(?:'. $table .'\.)?'. $field .'(\s*(?:,|$))/is',
    +       '\1'. $field_to_select .'\2', $matches[1], 1
    +     );
    +
    +     return 'SELECT'. $select .'FROM'. $matches[2];
    +   }
    +   return $query;
    + }
    +
    + /**
    ++>>>>>>> origin/master:includes/database.mysql.inc
    * @} End of "ingroup database".
    */
    diff --cc includes/database.mysqli.inc
    index 1571fb6,e466ec0..193ac26
    --- a/includes/database.mysqli.inc
    +++ b/includes/database.mysqli.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/database.mysqli.inc
    +// $Id: database.mysqli.inc,v 1.54.2.2 2010/02/01 16:32:10 goba Exp $
    ++=======
    + // $Id: database.mysqli.inc,v 1.54.2.1 2009/07/21 08:52:30 goba Exp $
    ++>>>>>>> origin/master:includes/database.mysqli.inc
    
    /**
    * @file
    @@@ -352,6 -352,31 +356,34 @@@ function db_column_exists($table, $colu
    }
    
    /**
    ++<<<<<<< HEAD:includes/database.mysqli.inc
    ++=======
    +  * Wraps the given table.field entry with a DISTINCT(). The wrapper is added to
    +  * the SELECT list entry of the given query and the resulting query is returned.
    +  * This function only applies the wrapper if a DISTINCT doesn't already exist in
    +  * the query.
    +  *
    +  * @param $table Table containing the field to set as DISTINCT
    +  * @param $field Field to set as DISTINCT
    +  * @param $query Query to apply the wrapper to
    +  * @return SQL query with the DISTINCT wrapper surrounding the given table.field.
    +  */
    + function db_distinct_field($table, $field, $query) {
    +   $field_to_select = 'DISTINCT('. $table .'.'. $field .')';
    +   $matches = array();
    +   if (preg_match('/^SELECT(.*?)FROM(.*)/is', $query, $matches)) {
    +     $select = preg_replace(
    +       '/((?:^|,)\s*)(?<!DISTINCT\()(?:'. $table .'\.)?'. $field .'(\s*(?:,|$))/is',
    +       '\1'. $field_to_select .'\2', $matches[1], 1
    +     );
    +
    +     return 'SELECT'. $select .'FROM'.$matches[2];
    +   }
    +   return $query;
    + }
    +
    + /**
    ++>>>>>>> origin/master:includes/database.mysqli.inc
    * @} End of "ingroup database".
    */
    
    diff --cc includes/database.pgsql.inc
    index 1d84c44,60ae70a..d8da7bb
    --- a/includes/database.pgsql.inc
    +++ b/includes/database.pgsql.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/database.pgsql.inc
    +// $Id: database.pgsql.inc,v 1.68.2.8 2010/02/01 16:32:10 goba Exp $
    ++=======
    + // $Id: database.pgsql.inc,v 1.68.2.7 2009/09/14 10:49:34 goba Exp $
    ++>>>>>>> origin/master:includes/database.pgsql.inc
    
    /**
    * @file
    diff --cc includes/file.inc
    index 12fea1d,18f74eb..d4e2e49
    --- a/includes/file.inc
    +++ b/includes/file.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/file.inc
    +// $Id: file.inc,v 1.121.2.11 2010/03/01 09:51:16 goba Exp $
    ++=======
    + // $Id: file.inc,v 1.121.2.9 2009/09/16 19:34:14 goba Exp $
    ++>>>>>>> origin/master:includes/file.inc
    
    /**
    * @file
    diff --cc includes/form.inc
    index 65109d2,f08601a..7c99b03
    --- a/includes/form.inc
    +++ b/includes/form.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/form.inc
    +// $Id: form.inc,v 1.265.2.32 2010/03/01 09:24:22 goba Exp $
    ++=======
    + // $Id: form.inc,v 1.265.2.31 2009/12/07 15:54:52 goba Exp $
    ++>>>>>>> origin/master:includes/form.inc
    
    /**
    * @defgroup forms Form builder functions
    @@@ -132,13 -132,13 +136,22 @@@ function drupal_get_form($form_id)
    // fields.
    //
    // If $form_state['storage'] or $form_state['rebuild'] has been set
    ++<<<<<<< HEAD:includes/form.inc
    +  // and input has been processed, we know that we're in a complex
    +  // multi-part process of some sort and the form's workflow is NOT
    ++=======
    +   // and the form has been submitted, we know that we're in a complex
    +   // multi-part process of some sort and the form's workflow is NOT
    ++>>>>>>> origin/master:includes/form.inc
    // complete. We need to construct a fresh copy of the form, passing
    // in the latest $form_state in addition to any other variables passed
    // into drupal_get_form().
    
    ++<<<<<<< HEAD:includes/form.inc
    +  if ((!empty($form_state['storage']) || !empty($form_state['rebuild'])) && !empty($form_state['process_input']) && !form_get_errors()) {
    ++=======
    +   if ((!empty($form_state['storage']) || !empty($form_state['rebuild'])) && !empty($form_state['submitted']) && !form_get_errors()) {
    ++>>>>>>> origin/master:includes/form.inc
    $form = drupal_rebuild_form($form_id, $form_state, $args);
    }
    
    diff --cc includes/locale.inc
    index cfbdaaa,4737bb2..f84fec8
    --- a/includes/locale.inc
    +++ b/includes/locale.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/locale.inc
    +// $Id: locale.inc,v 1.174.2.12 2010/03/04 00:15:28 goba Exp $
    ++=======
    + // $Id: locale.inc,v 1.174.2.10 2009/09/15 10:40:26 goba Exp $
    ++>>>>>>> origin/master:includes/locale.inc
    
    /**
    * @file
    diff --cc includes/menu.inc
    index d72ba33,72aea45..750fd67
    --- a/includes/menu.inc
    +++ b/includes/menu.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/menu.inc
    +// $Id: menu.inc,v 1.255.2.34 2010/02/01 18:00:49 goba Exp $
    ++=======
    + // $Id: menu.inc,v 1.255.2.32 2009/10/06 11:59:05 goba Exp $
    ++>>>>>>> origin/master:includes/menu.inc
    
    /**
    * @file
    diff --cc includes/path.inc
    index db3eea0,609eba7..b6c64e5
    --- a/includes/path.inc
    +++ b/includes/path.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/path.inc
    +// $Id: path.inc,v 1.19.2.3 2010/03/01 09:19:15 goba Exp $
    ++=======
    + // $Id: path.inc,v 1.19.2.2 2009/12/16 17:35:11 goba Exp $
    ++>>>>>>> origin/master:includes/path.inc
    
    /**
    * @file
    diff --cc includes/theme.inc
    index ec87d35,1f66e31..b77687b
    --- a/includes/theme.inc
    +++ b/includes/theme.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/theme.inc
    +// $Id: theme.inc,v 1.415.2.27 2010/03/01 10:02:01 goba Exp $
    ++=======
    + // $Id: theme.inc,v 1.415.2.24 2009/06/18 12:04:04 goba Exp $
    ++>>>>>>> origin/master:includes/theme.inc
    
    /**
    * @file
    diff --cc includes/theme.maintenance.inc
    index f417c3b,1eb3a84..c6e9bfd
    --- a/includes/theme.maintenance.inc
    +++ b/includes/theme.maintenance.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:includes/theme.maintenance.inc
    +// $Id: theme.maintenance.inc,v 1.10.2.2 2010/03/04 00:15:28 goba Exp $
    ++=======
    + // $Id: theme.maintenance.inc,v 1.10.2.1 2009/08/10 11:11:59 goba Exp $
    ++>>>>>>> origin/master:includes/theme.maintenance.inc
    
    /**
    * @file
    diff --cc misc/teaser.js
    index a976510,321197f..fee4791
    --- a/misc/teaser.js
    +++ b/misc/teaser.js
    @@@ -1,4 -1,4 +1,8 @@@
    ++<<<<<<< HEAD:misc/teaser.js
    +// $Id: teaser.js,v 1.12.2.2 2010/03/01 10:13:18 goba Exp $
    ++=======
    + // $Id: teaser.js,v 1.12.2.1 2009/05/20 11:50:54 goba Exp $
    ++>>>>>>> origin/master:misc/teaser.js
    
    /**
    * Auto-attach for teaser behavior.
    diff --cc modules/aggregator/aggregator.info
    index 48baedb,db486b4..f65e366
    --- a/modules/aggregator/aggregator.info
    +++ b/modules/aggregator/aggregator.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/aggregator/aggregator.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/aggregator/aggregator.info
    
    diff --cc modules/block/block.info
    index 8b05a22,10a2614..f5093fd
    --- a/modules/block/block.info
    +++ b/modules/block/block.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - require
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/block/block.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/block/block.info
    
    diff --cc modules/blog/blog.info
    index 828bd1b,1bfc74d..a8dbec2
    --- a/modules/blog/blog.info
    +++ b/modules/blog/blog.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/blog/blog.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/blog/blog.info
    
    diff --cc modules/blogapi/blogapi.info
    index 14edb3d,535be06..f1c2d94
    --- a/modules/blogapi/blogapi.info
    +++ b/modules/blogapi/blogapi.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/blogapi/blogapi.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/blogapi/blogapi.info
    
    diff --cc modules/book/book.info
    index ac64127,b78cb45..1e4feda
    --- a/modules/book/book.info
    +++ b/modules/book/book.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/book/book.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/book/book.info
    
    diff --cc modules/color/color.info
    index bf1f3fb,56066a7..957d35f
    --- a/modules/color/color.info
    +++ b/modules/color/color.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/color/color.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/color/color.info
    
    diff --cc modules/comment/comment.info
    index deb9a6a,353fc95..77720b4
    --- a/modules/comment/comment.info
    +++ b/modules/comment/comment.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/comment/comment.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/comment/comment.info
    
    diff --cc modules/comment/comment.module
    index f310be3,ff28fd9..a686795
    --- a/modules/comment/comment.module
    +++ b/modules/comment/comment.module
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/comment/comment.module
    +// $Id: comment.module,v 1.617.2.14 2010/03/01 09:44:31 goba Exp $
    ++=======
    + // $Id: comment.module,v 1.617.2.10 2009/09/14 10:36:42 goba Exp $
    ++>>>>>>> origin/master:modules/comment/comment.module
    
    /**
    * @file
    diff --cc modules/contact/contact.info
    index e20d8ba,ea92703..f6a1091
    --- a/modules/contact/contact.info
    +++ b/modules/contact/contact.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/contact/contact.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/contact/contact.info
    
    diff --cc modules/dblog/dblog.info
    index 9f86392,bc478e3..80d45d1
    --- a/modules/dblog/dblog.info
    +++ b/modules/dblog/dblog.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/dblog/dblog.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/dblog/dblog.info
    
    diff --cc modules/filter/filter.info
    index 072260a,2c10135..b002ca7
    --- a/modules/filter/filter.info
    +++ b/modules/filter/filter.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - require
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/filter/filter.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/filter/filter.info
    
    diff --cc modules/filter/filter.module
    index d37fbd3,81fac6b..d41b4fd
    --- a/modules/filter/filter.module
    +++ b/modules/filter/filter.module
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/filter/filter.module
    +// $Id: filter.module,v 1.204.2.10 2010/03/01 10:54:29 goba Exp $
    ++=======
    + // $Id: filter.module,v 1.204.2.9 2009/08/10 11:04:37 goba Exp $
    ++>>>>>>> origin/master:modules/filter/filter.module
    
    /**
    * @file
    diff --cc modules/forum/forum.info
    index 7ddb3e9,de224be..f015cc7
    --- a/modules/forum/forum.info
    +++ b/modules/forum/forum.info
    @@@ -7,8 -7,8 +7,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/forum/forum.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/forum/forum.info
    
    diff --cc modules/forum/forum.module
    index 71b8b46,57eb60e..3b19a89
    --- a/modules/forum/forum.module
    +++ b/modules/forum/forum.module
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/forum/forum.module
    +// $Id: forum.module,v 1.448.2.8 2010/03/01 11:32:00 goba Exp $
    ++=======
    + // $Id: forum.module,v 1.448.2.7 2009/06/03 18:27:48 goba Exp $
    ++>>>>>>> origin/master:modules/forum/forum.module
    
    /**
    * @file
    diff --cc modules/help/help.info
    index 6cb7d6a,7b798e2..acefea0
    --- a/modules/help/help.info
    +++ b/modules/help/help.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/help/help.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/help/help.info
    
    diff --cc modules/locale/locale.info
    index 8ecd20f,3f6a28e..7c80431
    --- a/modules/locale/locale.info
    +++ b/modules/locale/locale.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/locale/locale.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/locale/locale.info
    
    diff --cc modules/menu/menu.info
    index b3b5123,015e52f..1356596
    --- a/modules/menu/menu.info
    +++ b/modules/menu/menu.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/menu/menu.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/menu/menu.info
    
    diff --cc modules/node/node.info
    index 6584d61,9617a3b..03c03de
    --- a/modules/node/node.info
    +++ b/modules/node/node.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - require
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/node/node.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/node/node.info
    
    diff --cc modules/node/node.module
    index 8cbfacc,876a643..bda486c
    --- a/modules/node/node.module
    +++ b/modules/node/node.module
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/node/node.module
    +// $Id: node.module,v 1.947.2.22 2010/03/03 21:36:37 goba Exp $
    ++=======
    + // $Id: node.module,v 1.947.2.19 2009/09/23 09:09:30 goba Exp $
    ++>>>>>>> origin/master:modules/node/node.module
    
    /**
    * @file
    diff --cc modules/openid/openid.inc
    index 9223a4d,d0d9876..0a43ff8
    --- a/modules/openid/openid.inc
    +++ b/modules/openid/openid.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/openid/openid.inc
    +// $Id: openid.inc,v 1.8.2.3 2010/03/01 11:06:41 goba Exp $
    ++=======
    + // $Id: openid.inc,v 1.8.2.2 2009/12/16 17:54:55 goba Exp $
    ++>>>>>>> origin/master:modules/openid/openid.inc
    
    /**
    * @file
    diff --cc modules/openid/openid.info
    index 001d5c3,c7f36b9..d02046c
    --- a/modules/openid/openid.info
    +++ b/modules/openid/openid.info
    @@@ -5,8 -5,8 +5,15 @@@ version = VERSIO
    package = Core - optional
    core = 6.x
    
    ++<<<<<<< HEAD:modules/openid/openid.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/openid/openid.info
    
    diff --cc modules/path/path.info
    index f2796da,48111cd..91f7a67
    --- a/modules/path/path.info
    +++ b/modules/path/path.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/path/path.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/path/path.info
    
    diff --cc modules/php/php.info
    index 4099c53,4b91de7..7f50b86
    --- a/modules/php/php.info
    +++ b/modules/php/php.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/php/php.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/php/php.info
    
    diff --cc modules/ping/ping.info
    index e9b334a,c30624e..5d679ec
    --- a/modules/ping/ping.info
    +++ b/modules/ping/ping.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/ping/ping.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/ping/ping.info
    
    diff --cc modules/poll/poll.info
    index 64b4391,e7f12dc..9d42b03
    --- a/modules/poll/poll.info
    +++ b/modules/poll/poll.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/poll/poll.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/poll/poll.info
    
    diff --cc modules/profile/profile.info
    index 7e1f51d,08c9a96..8d991df
    --- a/modules/profile/profile.info
    +++ b/modules/profile/profile.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/profile/profile.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/profile/profile.info
    
    diff --cc modules/search/search.info
    index b5e9dce,62f81ed..4852036
    --- a/modules/search/search.info
    +++ b/modules/search/search.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/search/search.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/search/search.info
    
    diff --cc modules/statistics/statistics.info
    index 4d60d6f,cf30ab2..2924bfb
    --- a/modules/statistics/statistics.info
    +++ b/modules/statistics/statistics.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/statistics/statistics.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/statistics/statistics.info
    
    diff --cc modules/syslog/syslog.info
    index 8fea2f1,93e91b5..9161776
    --- a/modules/syslog/syslog.info
    +++ b/modules/syslog/syslog.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/syslog/syslog.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/syslog/syslog.info
    
    diff --cc modules/system/system.admin.inc
    index dd651eb,2bae97e..8595d0a
    --- a/modules/system/system.admin.inc
    +++ b/modules/system/system.admin.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/system/system.admin.inc
    +// $Id: system.admin.inc,v 1.63.2.14 2010/03/01 10:20:28 goba Exp $
    ++=======
    + // $Id: system.admin.inc,v 1.63.2.13 2009/09/16 18:02:32 goba Exp $
    ++>>>>>>> origin/master:modules/system/system.admin.inc
    
    /**
    * @file
    diff --cc modules/system/system.info
    index e750de2,2ee8d28..7786c19
    --- a/modules/system/system.info
    +++ b/modules/system/system.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - require
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/system/system.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/system/system.info
    
    diff --cc modules/system/system.install
    index 9490388,1e83b58..e1ead5a
    --- a/modules/system/system.install
    +++ b/modules/system/system.install
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/system/system.install
    +// $Id: system.install,v 1.238.2.22 2010/03/01 16:53:57 goba Exp $
    ++=======
    + // $Id: system.install,v 1.238.2.19 2009/11/06 08:39:46 goba Exp $
    ++>>>>>>> origin/master:modules/system/system.install
    
    /**
    * Test and report Drupal installation requirements.
    @@@ -2648,49 -2623,6 +2652,52 @@@ function system_update_6053()
    }
    
    /**
    ++<<<<<<< HEAD:modules/system/system.install
    + * Add semaphore table.
    + */
    +function system_update_6054() {
    +  $ret = array();
    +
    +  $schema['semaphore'] = array(
    +    'fields' => array(
    +      'name' => array(
    +        'type' => 'varchar',
    +        'length' => 255,
    +        'not null' => TRUE,
    +        'default' => ''),
    +      'value' => array(
    +        'type' => 'varchar',
    +        'length' => 255,
    +        'not null' => TRUE,
    +        'default' => ''),
    +      'expire' => array(
    +        'type' => 'float',
    +        'size' => 'big',
    +        'not null' => TRUE),
    +      ),
    +    'indexes' => array('expire' => array('expire')),
    +    'primary key' => array('name'),
    +  );
    +  db_create_table($ret, 'semaphore', $schema['semaphore']);
    +
    +  return $ret;
    +}
    +
    +/**
    + * Improve indexes on the {url_alias} table.
    + */
    +function system_update_6055() {
    +  $ret = array();
    +  db_drop_index($ret, 'url_alias', 'src_language');
    +  db_drop_unique_key($ret, 'url_alias', 'dst_language');
    +  db_add_index($ret, 'url_alias', 'src_language_pid', array('src', 'language', 'pid'));
    +  db_add_unique_key($ret, 'url_alias', 'dst_language_pid', array('dst', 'language', 'pid'));
    +  return $ret;
    +}
    +
    +/**
    ++=======
    ++>>>>>>> origin/master:modules/system/system.install
    * @} End of "defgroup updates-6.x-extra"
    * The next series of updates should start at 7000.
    */
    diff --cc modules/system/system.module
    index 4bed9c1,50b83a5..edd21ed
    --- a/modules/system/system.module
    +++ b/modules/system/system.module
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/system/system.module
    +// $Id: system.module,v 1.585.2.49 2010/03/04 00:15:28 goba Exp $
    ++=======
    + // $Id: system.module,v 1.585.2.47 2009/12/16 20:47:10 goba Exp $
    ++>>>>>>> origin/master:modules/system/system.module
    
    /**
    * @file
    @@@ -9,7 -9,7 +13,11 @@@
    /**
    * The current system version.
    */
    ++<<<<<<< HEAD:modules/system/system.module
    +define('VERSION', '6.16');
    ++=======
    + define('VERSION', '6.15');
    ++>>>>>>> origin/master:modules/system/system.module
    
    /**
    * Core API compatibility.
    diff --cc modules/taxonomy/taxonomy.info
    index e32d534,dbe0823..bbdb870
    --- a/modules/taxonomy/taxonomy.info
    +++ b/modules/taxonomy/taxonomy.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/taxonomy/taxonomy.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/taxonomy/taxonomy.info
    
    diff --cc modules/taxonomy/taxonomy.module
    index e7bec89,ebf3d85..3f434d5
    --- a/modules/taxonomy/taxonomy.module
    +++ b/modules/taxonomy/taxonomy.module
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/taxonomy/taxonomy.module
    +// $Id: taxonomy.module,v 1.414.2.13 2010/03/01 10:08:21 goba Exp $
    ++=======
    + // $Id: taxonomy.module,v 1.414.2.12 2009/09/15 11:13:08 goba Exp $
    ++>>>>>>> origin/master:modules/taxonomy/taxonomy.module
    
    /**
    * @file
    diff --cc modules/throttle/throttle.info
    index 72dd4b8,a10b653..f599f4e
    --- a/modules/throttle/throttle.info
    +++ b/modules/throttle/throttle.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/throttle/throttle.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/throttle/throttle.info
    
    diff --cc modules/tracker/tracker.info
    index 73b0df9,d3b04db..d813624
    --- a/modules/tracker/tracker.info
    +++ b/modules/tracker/tracker.info
    @@@ -6,8 -6,8 +6,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/tracker/tracker.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/tracker/tracker.info
    
    diff --cc modules/translation/translation.info
    index debb27c,371ba50..14f58a7
    --- a/modules/translation/translation.info
    +++ b/modules/translation/translation.info
    @@@ -6,8 -6,8 +6,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/translation/translation.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/translation/translation.info
    
    diff --cc modules/trigger/trigger.info
    index e04c6dd,a1aeddb..c66073d
    --- a/modules/trigger/trigger.info
    +++ b/modules/trigger/trigger.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/trigger/trigger.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/trigger/trigger.info
    
    diff --cc modules/update/update.compare.inc
    index 1437bce,7aa1d61..a0415c0
    --- a/modules/update/update.compare.inc
    +++ b/modules/update/update.compare.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/update/update.compare.inc
    +// $Id: update.compare.inc,v 1.8.2.8 2010/03/01 09:40:45 goba Exp $
    ++=======
    + // $Id: update.compare.inc,v 1.8.2.7 2009/11/06 07:26:21 goba Exp $
    ++>>>>>>> origin/master:modules/update/update.compare.inc
    
    /**
    * @file
    @@@ -124,9 -124,7 +128,13 @@@ function _update_process_info_list(&$pr
    // project can have multiple modules or themes.
    $projects[$project_name] = array(
    'name' => $project_name,
    ++<<<<<<< HEAD:modules/update/update.compare.inc
    +        // Only save attributes from the .info file we care about so we do not
    +        // bloat our RAM usage needlessly.
    +        'info' => update_filter_project_info($file->info),
    ++=======
    +         'info' => $file->info,
    ++>>>>>>> origin/master:modules/update/update.compare.inc
    'datestamp' => $file->info['datestamp'],
    'includes' => array($file->name => $file->info['name']),
    'project_type' => $project_name == 'drupal' ? 'core' : $project_type,
    diff --cc modules/update/update.info
    index cec15af,beef4b3..92b994d
    --- a/modules/update/update.info
    +++ b/modules/update/update.info
    @@@ -5,8 -5,8 +5,15 @@@ version = VERSIO
    package = Core - optional
    core = 6.x
    
    ++<<<<<<< HEAD:modules/update/update.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/update/update.info
    
    diff --cc modules/upload/upload.info
    index 96c68cc,5e32619..1078715
    --- a/modules/upload/upload.info
    +++ b/modules/upload/upload.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - optiona
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/upload/upload.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/upload/upload.info
    
    diff --cc modules/user/user.info
    index 79f85fa,f0558a8..c1b15ee
    --- a/modules/user/user.info
    +++ b/modules/user/user.info
    @@@ -5,8 -5,8 +5,15 @@@ package = Core - require
    version = VERSION
    core = 6.x
    
    ++<<<<<<< HEAD:modules/user/user.info
    +; Information added by drupal.org packaging script on 2010-03-04
    +version = "6.16"
    +project = "drupal"
    +datestamp = "1267662008"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-12-16
    + version = "6.15"
    + project = "drupal"
    + datestamp = "1260996916"
    ++>>>>>>> origin/master:modules/user/user.info
    
    diff --cc modules/user/user.module
    index f77f50d,71a370d..3bba50c
    --- a/modules/user/user.module
    +++ b/modules/user/user.module
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:modules/user/user.module
    +// $Id: user.module,v 1.892.2.20 2010/03/01 11:42:50 goba Exp $
    ++=======
    + // $Id: user.module,v 1.892.2.19 2009/11/06 07:36:34 goba Exp $
    ++>>>>>>> origin/master:modules/user/user.module
    
    /**
    * @file
    diff --cc sites/all/modules/pathauto/pathauto.inc
    index 27a0473,1b0360f..b8f96c2
    --- a/sites/all/modules/pathauto/pathauto.inc
    +++ b/sites/all/modules/pathauto/pathauto.inc
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.inc
    +// $Id: pathauto.inc,v 1.45.2.10 2010/02/20 03:05:19 davereid Exp $
    ++=======
    + // $Id: pathauto.inc,v 1.45.2.3 2009/10/20 17:52:12 greggles Exp $
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.inc
    
    /**
    * @file
    @@@ -22,14 -66,14 +26,18 @@@
    */
    function _pathauto_alias_exists($alias, $src, $language = '') {
    $alias_pid = db_result(db_query_range("SELECT pid FROM {url_alias} WHERE dst = '%s' AND src <> '%s' AND language = '%s'", array($alias, $src, $language), 0, 1));
    -  if (function_exists('path_redirect_delete')) {
    +  if (function_exists('path_redirect_delete_multiple')) {
    // Delete from path_redirect the exact same alias to the same node.
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.inc
    +    path_redirect_delete_multiple(NULL, array('source' => $alias, 'redirect' => $src));
    ++=======
    +     path_redirect_delete(array('path' => $alias, 'redirect' => $src));
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.inc
    
    // If there still is this alias used in path_redirect, then create a different alias
    -    $redirect_rid = db_result(db_query_range("SELECT rid FROM {path_redirect} WHERE path = '%s'", $alias, 0, 1));
    +    $redirects = path_redirect_load_multiple(NULL, array('source' => $alias));
    }
    -  if ($alias_pid || !empty($redirect_rid)) {
    +  if ($alias_pid || !empty($redirects)) {
    return TRUE;
    }
    else {
    @@@ -146,8 -190,24 +154,29 @@@ function pathauto_cleanstring($string,
    // Always replace whitespace with the separator.
    $output = preg_replace('/\s+/', $separator, $output);
    
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.inc
    +  // Trim duplicates and remove trailing and leading separators.
    +  $output = _pathauto_clean_separators($output, $separator);
    ++=======
    +   // In preparation for pattern matching,
    +   // escape the separator if and only if it is not alphanumeric.
    +   if (isset($separator)) {
    +     if (preg_match('/^[^'. PREG_CLASS_ALNUM .']+$/uD', $separator)) {
    +       $seppattern = $separator;
    +     }
    +     else {
    +       $seppattern = '\\'. $separator;
    +     }
    +     // Trim any leading or trailing separators (note the need to
    +     $output = preg_replace("/^$seppattern+|$seppattern+$/", '', $output);
    +
    +     // Replace trailing separators around slashes.
    +     $output = preg_replace("/$seppattern\/|\/$seppattern/", "/", $output);
    +
    +     // Replace multiple separators with a single one
    +     $output = preg_replace("/$seppattern+/", "$separator", $output);
    +   }
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.inc
    
    // Enforce the maximum component length
    $maxlength = min(variable_get('pathauto_max_component_length', 100), 128);
    @@@ -417,7 -405,7 +446,11 @@@ function _pathauto_set_alias($src, $dst
    if (variable_get('pathauto_update_action', 2) == 3 && function_exists('path_redirect_save')) {
    if (!empty($old_alias)) {
    $redirect = array(
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.inc
    +          'source' => $old_alias,
    ++=======
    +           'path' => $old_alias,
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.inc
    'redirect' => $src,
    );
    path_redirect_save($redirect);
    diff --cc sites/all/modules/pathauto/pathauto.info
    index 2c75b94,4577d5e..1d74411
    --- a/sites/all/modules/pathauto/pathauto.info
    +++ b/sites/all/modules/pathauto/pathauto.info
    @@@ -6,9 -6,9 +6,17 @@@ dependencies[] = toke
    suggests[] = path_redirect
    core = 6.x
    
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.info
    +; Information added by drupal.org packaging script on 2010-02-27
    +version = "6.x-1.3"
    +core = "6.x"
    +project = "pathauto"
    +datestamp = "1267299906"
    ++=======
    + ; Information added by drupal.org packaging script on 2009-10-21
    + version = "6.x-1.2"
    + core = "6.x"
    + project = "pathauto"
    + datestamp = "1256137878"
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.info
    
    diff --cc sites/all/modules/pathauto/pathauto.js
    index 7ef5030,50a1c6a..8695728
    --- a/sites/all/modules/pathauto/pathauto.js
    +++ b/sites/all/modules/pathauto/pathauto.js
    @@@ -1,4 -1,4 +1,8 @@@
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.js
    +// $Id: pathauto.js,v 1.4.2.2 2010/02/10 21:50:30 greggles Exp $
    ++=======
    + // $Id: pathauto.js,v 1.4.2.1 2009/04/18 17:10:10 freso Exp $
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.js
    if (Drupal.jsEnabled) {
    $(document).ready(function() {
    if ($("#edit-pathauto-perform-alias").size() && $("#edit-pathauto-perform-alias").attr("checked")) {
    diff --cc sites/all/modules/pathauto/pathauto.module
    index 9d9a568,a5208e0..d2d00f0
    --- a/sites/all/modules/pathauto/pathauto.module
    +++ b/sites/all/modules/pathauto/pathauto.module
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.module
    +// $Id: pathauto.module,v 1.118.2.19 2010/02/19 23:11:29 davereid Exp $
    ++=======
    + // $Id: pathauto.module,v 1.118.2.6 2009/10/17 17:45:53 greggles Exp $
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.module
    
    /**
    * @defgroup pathauto Pathauto: Automatically generates aliases for content
    @@@ -104,7 -111,7 +108,11 @@@ function pathauto_token_values($type, $
    
    // Get taxonomy related data.
    $vid = db_result(db_query_range("SELECT t.vid FROM {term_node} r INNER JOIN {term_data} t ON r.tid = t.tid INNER JOIN {vocabulary} v ON t.vid = v.vid WHERE r.vid = %d ORDER BY v.weight, t.weight, t.name", $object->vid, 0, 1));
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.module
    +          $category = db_fetch_object(db_query_range("SELECT t.tid, t.name FROM {term_data} t INNER JOIN {term_node} r ON r.tid = t.tid WHERE t.vid = %d AND r.nid = %d ORDER BY t.weight", $vid, $object->nid, 0, 1));
    ++=======
    +           $category = db_fetch_object(db_query_range("SELECT t.tid, t.name FROM {term_data} t INNER JOIN {term_node} r ON r.tid = t.tid WHERE t.vid = %d AND r.nid = %d ORDER BY weight", $vid, $object->nid, 0, 1));
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.module
    $category->vid = $vid;
    // In the realm of nodes these are terms, in the realm of Taxonomy, cats
    $label = 'term';
    @@@ -201,49 -207,51 +209,74 @@@ function pathauto_path_alias_types()
    * Implementation of hook_nodeapi().
    */
    function pathauto_nodeapi(&$node, $op, $teaser, $page) {
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.module
    +  switch ($op) {
    +    case 'presave':
    +      // About to be saved (before insert/update)
    +      if (!empty($node->pathauto_perform_alias) && isset($node->old_alias)
    +          && $node->path == '' && $node->old_alias != '') {
    +        /**
    +         * There was an old alias, but when pathauto_perform_alias was checked
    +         * the javascript disabled the textbox which led to an empty value being
    +         * submitted. Restoring the old path-value here prevents the Path module
    +         * from deleting any old alias before Pathauto gets control.
    +         */
    +        $node->path = $node->old_alias;
    +      }
    +      break;
    +    case 'insert':
    +    case 'update':
    +      _pathauto_include();
    +      // Get the specific pattern or the default
    +      if (variable_get('language_content_type_'. $node->type, 0)) {
    +        $pattern = trim(variable_get('pathauto_node_'. $node->type .'_'. $node->language .'_pattern', FALSE));
    +      }
    +      if (empty($pattern)) {
    +        $pattern = trim(variable_get('pathauto_node_'. $node->type .'_pattern', FALSE));
    ++=======
    +   if (module_exists('path')) {
    +     switch ($op) {
    +       case 'presave':
    +         // About to be saved (before insert/update)
    +         if (!empty($node->pathauto_perform_alias) && isset($node->old_alias)
    +             && $node->path == '' && $node->old_alias != '') {
    +           /**
    +            * There was an old alias, but when pathauto_perform_alias was checked
    +            * the javascript disabled the textbox which led to an empty value being
    +            * submitted. Restoring the old path-value here prevents the Path module
    +            * from deleting any old alias before Pathauto gets control.
    +            */
    +           $node->path = $node->old_alias;
    +         }
    +         break;
    +       case 'insert':
    +       case 'update':
    +         _pathauto_include();
    +         // Get the specific pattern or the default
    +         if (variable_get('language_content_type_'. $node->type, 0)) {
    +           $pattern = trim(variable_get('pathauto_node_'. $node->type .'_'. $node->language .'_pattern', FALSE));
    +         }
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.module
    if (empty($pattern)) {
    -          $pattern = trim(variable_get('pathauto_node_'. $node->type .'_pattern', FALSE));
    -          if (empty($pattern)) {
    -            $pattern = trim(variable_get('pathauto_node_pattern', FALSE));
    -          }
    +          $pattern = trim(variable_get('pathauto_node_pattern', FALSE));
    }
    -        // Only do work if there's a pattern
    -        if ($pattern) {
    -          // Only create an alias if the checkbox was not provided or if the checkbox was provided and is checked
    -          if (!isset($node->pathauto_perform_alias) || $node->pathauto_perform_alias) {
    -            $placeholders = pathauto_get_placeholders('node', $node);
    -            $src = "node/$node->nid";
    -            $alias = pathauto_create_alias('node', $op, $placeholders, $src, $node->nid, $node->type, $node->language);
    -          }
    +      }
    +      // Only do work if there's a pattern
    +      if ($pattern) {
    +        // Only create an alias if the checkbox was not provided or if the checkbox was provided and is checked
    +        if (!isset($node->pathauto_perform_alias) || $node->pathauto_perform_alias) {
    +          $placeholders = pathauto_get_placeholders('node', $node);
    +          $src = "node/$node->nid";
    +          $alias = pathauto_create_alias('node', $op, $placeholders, $src, $node->nid, $node->type, $node->language);
    }
    -        break;
    -      case 'delete':
    -        path_set_alias('node/'. $node->nid);
    -        path_set_alias('node/'. $node->nid .'/feed');
    -        break;
    -      default:
    -        break;
    -    }
    +      }
    +      break;
    +    case 'delete':
    +      path_set_alias('node/'. $node->nid);
    +      path_set_alias('node/'. $node->nid .'/feed');
    +      break;
    +    default:
    +      break;
    }
    }
    
    @@@ -275,7 -283,7 +308,11 @@@ function pathauto_form_alter(&$form, $f
    // If there is a pattern, show the automatic alias checkbox.
    if ($pattern) {
    if (!isset($node->pathauto_perform_alias)) {
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.module
    +        if (!empty($node->nid)) {
    ++=======
    +         if (isset($node->nid)) {
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.module
    // If this is not a new node, compare it's current alias to the
    // alias that would be genereted by pathauto. If they are the same,
    // then keep the automatic alias enabled.
    @@@ -293,9 -301,6 +330,12 @@@
    // Add JavaScript that will disable the path textfield when the automatic
    // alias checkbox is checked.
    drupal_add_js(drupal_get_path('module', 'pathauto') .'/pathauto.js');
    ++<<<<<<< HEAD:sites/all/modules/pathauto/pathauto.module
    +
    +      // Override path.module's vertical tabs summary.
    +      $form['path']['#attached']['js']['vertical-tabs'] = drupal_get_path('module', 'pathauto') . '/pathauto.js';
    ++=======
    ++>>>>>>> origin/master:sites/all/modules/pathauto/pathauto.module
    
    $form['path']['pathauto_perform_alias'] = array(
    '#type' => 'checkbox',
    diff --cc sites/all/modules/pathauto/tests/pathauto.test
    index 7933bc6,4421b16..bd95e17
    --- a/sites/all/modules/pathauto/tests/pathauto.test
    +++ b/sites/all/modules/pathauto/tests/pathauto.test
    @@@ -1,5 -1,5 +1,9 @@@
    <?php
    ++<<<<<<< HEAD:sites/all/modules/pathauto/tests/pathauto.test
    +// $Id: pathauto.test,v 1.2.2.6 2010/02/20 03:05:17 davereid Exp $
    ++=======
    + // $Id: pathauto.test,v 1.2.2.2 2009/05/02 20:12:03 freso Exp $
    ++>>>>>>> origin/master:sites/all/modules/pathauto/tests/pathauto.test
    
    /**
    * @file
    @@@ -9,163 -9,81 +13,235 @@@
    */
    
    /**
    ++<<<<<<< HEAD:sites/all/modules/pathauto/tests/pathauto.test
    + * Implements hook_simpletest_alter().
    + */
    +function pathauto_simpletest_alter(&$groups) {
    +  // Enforce dependency on token for all pathauto tests.
    +  if (!drupal_get_filename('module', 'token')) {
    +    unset($groups['Pathauto']);
    +  }
    +}
    +/**
    + * Unit tests for Pathauto functions.
    + */
    +class PathautoUnitTestCase extends DrupalWebTestCase {
    +  public static function getInfo() {
    +    return array(
    +      'name' => 'Pathauto unit tests',
    +      'description' => 'Unit tests for Pathauto functions.',
    ++=======
    +  * @todo
    +  */
    + class PathautoTestCase extends DrupalWebTestCase {
    +   private $web_user;
    +   private $content_type;
    +
    +   /**
    +    * Implementation of getInfo().
    +    */
    +   function getInfo() {
    +     return array(
    +       'name' => t('Pathauto basic tests'),
    +       'description' => t('Test basic pathauto functionality.'),
    ++>>>>>>> origin/master:sites/all/modules/pathauto/tests/pathauto.test
    'group' => 'Pathauto',
    );
    }
    
    +  function setUp() {
    +    parent::setUp('path', 'token', 'pathauto');
    +    module_load_include('inc', 'pathauto');
    +  }
    +
    /**
    -   * Implementation of setUp().
    +   * Test _pathauto_get_schema_alias_maxlength().
    */
    +  function testGetSchemaAliasMaxLength() {
    +    $this->assertIdentical(_pathauto_get_schema_alias_maxlength(), 128);
    +  }
    +}
    +
    +/**
    + * Helper test class with some added functions for testing.
    + */
    +class PathautoTestHelper extends DrupalWebTestCase {
    +  protected $admin_user;
    +
    function setUp() {
    ++<<<<<<< HEAD:sites/all/modules/pathauto/tests/pathauto.test
    +    // Call parent::setUp() allowing test cases to pass further modules.
    +    $modules = func_get_args();
    +    $modules = array_merge(array('path', 'token', 'pathauto'), $modules);
    +    call_user_func_array(array('parent', 'setUp'), $modules);
    +
    +    // Set pathauto settings we assume to be as-is in this test.
    +    variable_set('pathauto_node_page_pattern', 'content/[title-raw]');
    +
    +    $this->admin_user = $this->drupalCreateUser(array(
    ++=======
    +     parent::setUp('path', 'token', 'pathauto');
    +
    +     $this->content_type = $this->drupalCreateContentType();
    +     $this->web_user = $this->drupalCreateUser(array(
    ++>>>>>>> origin/master:sites/all/modules/pathauto/tests/pathauto.test
    'administer pathauto',
    -      'create '. $this->content_type->type .' content',
    -      'edit own '. $this->content_type->type .' content',
    +      'create page content',
    +      'edit own page content',
    'administer url aliases',
    'create url aliases',
    ));
    ++<<<<<<< HEAD:sites/all/modules/pathauto/tests/pathauto.test
    +
    +    $this->drupalLogin($this->admin_user);
    +  }
    +
    +  function assertNodeAlias(stdClass $node, $expected_alias) {
    +    $alias = drupal_get_path_alias('node/' . $node->nid);
    +    $this->assertEqual($alias, $expected_alias);
    +  }
    +}
    +
    +/**
    + * Test basic pathauto functionality.
    + */
    +class PathautoFunctionalTestCase extends PathautoTestHelper {
    +  public static function getInfo() {
    +    return array(
    +      'name' => 'Pathauto basic tests',
    +      'description' => 'Test basic pathauto functionality.',
    +      'group' => 'Pathauto',
    +    );
    +  }
    ++=======
    +
    +     // Set pathauto settings we assume to be as-is in this test.
    +     variable_set('pathauto_node_'. $this->content_type->type .'_pattern', 'content/[title-raw]');
    +     variable_set('pathauto_separator', '-');
    +     variable_set('pathauto_case', '1'); // lowercase
    +     variable_set('pathauto_max_length', '100');
    +     variable_set('pathauto_max_component_length', '100');
    +     variable_set('pathauto_punctuation_underscore', '2'); // no action
    +
    +     $this->assertTrue(module_exists('pathauto'), t('Pathauto module is loaded.'));
    +     $this->assertTrue(module_exists('path'), t('Path module is loaded.'));
    +     $this->assertTrue(module_exists('token'), t('Token module is loaded.'));
    +   }
    +
    +   /**
    +    * Basic functional testing of Pathauto.
    +    */
    +   function testPathautoFunctionalTest() {
    +     $this->drupalLogin($this->web_user);
    +
    +     $this->drupalGet('admin/build/path/pathauto');
    +     $this->assertRaw(t('General settings'), 'Settings page displayed.', 'Functionality test');
    ++>>>>>>> origin/master:sites/all/modules/pathauto/tests/pathauto.test
    
    +  /**
    +   * Basic functional testing of Pathauto.
    +   */
    +  function testNodeEditing() {
    // Create node for testing.
    ++<<<<<<< HEAD:sites/all/modules/pathauto/tests/pathauto.test
    +    $random_title = $this->randomName(10);
    +    $title = ' Simpletest title ' . $random_title . ' [';
    +    $automatic_alias = 'content/simpletest-title-' . strtolower($random_title);
    +    $node = $this->drupalCreateNode(array('title' => $title, 'type' => 'page'));
    +
    +    // Look for alias generated in the form.
    +    $this->drupalGet('node/' . $node->nid . '/edit');
    +    $this->assertFieldChecked('edit-pathauto-perform-alias');
    +    $this->assertFieldByName('path', $automatic_alias, 'Proper automated alias generated.');
    +
    +    // Check whether the alias actually works.
    +    $this->drupalGet($automatic_alias);
    +    $this->assertText($title, 'Node accessible through automatic alias.');
    +
    +    // Manually set the node's alias.
    +    $manual_alias = 'content/' . $node->nid;
    +    $edit = array(
    +      'pathauto_perform_alias' => FALSE,
    +      'path' => $manual_alias,
    +    );
    +    $this->drupalPost('node/' . $node->nid . '/edit', $edit, t('Save'));
    +    $this->assertText(t('@type @title has been updated', array('@type' => 'Page', '@title' => $title)));
    +
    +    // Check that the automatic alias checkbox is now unchecked by default.
    +    $this->drupalGet('node/' . $node->nid . '/edit');
    +    $this->assertNoFieldChecked('edit-pathauto-perform-alias');
    +    $this->assertFieldByName('path', $manual_alias);
    +
    +    // Submit the node form with the default values.
    +    $this->drupalPost(NULL, array(), t('Save'));
    +    $this->assertText(t('@type @title has been updated', array('@type' => 'Page', '@title' => $title)));
    +
    +    // Test that the old (automatic) alias has been deleted and only accessible
    +    // through the new (manual) alias.
    +    $this->drupalGet($automatic_alias);
    +    $this->assertResponse(404, 'Node not accessible through automatic alias.');
    +    $this->drupalGet($manual_alias);
    +    $this->assertText($title, 'Node accessible through manual alias.');
    +  }
    +}
    +
    +/*
    + * Unit tests for the book tokens provided by Pathauto.
    + */
    +class PathautoBookTokenTestCase extends PathautoTestHelper {
    +  public static function getInfo() {
    +    return array(
    +      'name' => 'Pathauto book tokens',
    +      'description' => 'Unit tests for the book tokens provided by Pathauto.',
    +      'group' => 'Pathauto',
    +    );
    +  }
    +
    +  function setUp() {
    +    parent::setUp('book');
    +    variable_set('book_allowed_types', array('book', 'page'));
    +  }
    +
    +  function testBookPathAlias() {
    +    variable_set('pathauto_node_book_pattern', '[bookpathalias]/[title-raw]');
    +
    +    // Add a root book page.
    +    $parent_node = $this->drupalCreateNode(array('type' => 'book', 'title' => 'Root', 'book' => array('bid' => 'new')));
    +    $this->assertNodeAlias($parent_node, 'root');
    +
    +    // Add a first child page.
    +    $child_node1 = $this->drupalCreateNode(array('type' => 'book', 'title' => 'Sub page1', 'book' => array('bid' => $parent_node->book['bid'], 'plid' => $parent_node->book['mlid'])));
    +    $this->assertNodeAlias($child_node1, 'root/sub-page1');
    +
    +    // Add a second child page.
    +    $child_node2 = $this->drupalCreateNode(array('type' => 'book', 'title' => 'Sub page2', 'book' => array('bid' => $parent_node->book['bid'], 'plid' => $parent_node->book['mlid'])));
    +    $this->assertNodeAlias($child_node2, 'root/sub-page2');
    +
    +    // Add a child page on an existing child page.
    +    $sub_child_node1 = $this->drupalCreateNode(array('type' => 'book', 'title' => 'Sub-sub Page1', 'book' => array('bid' => $parent_node->book['bid'], 'plid' => $child_node1->book['mlid'])));
    +    $this->assertNodeAlias($sub_child_node1, 'root/sub-page1/sub-sub-page1');
    ++=======
    +     $random_title = $this->randomName(10); // this contains _
    +     $expected_alias = 'content/simpletest-title-'. strtolower($random_title);
    +     $edit = array(
    +       'title' => 'Simpletest title '. $random_title,
    +       'body'  => 'Simpletest body '. $this->randomName(10),
    +     );
    +
    +     $this->drupalPost('node/add/'. str_replace('_', '-', $this->content_type->type), $edit, 'Save');
    +     $this->assertRaw(t('@type %title has been created.', array('@type' => $this->content_type->name, '%title' => $edit['title'])), 'Test node submitted.', 'Functionality test');
    +
    +     // Look for alias generated in the form.
    +     $node = node_load(array('title' => $edit['title']));
    +     $this->drupalGet('node/'. $node->nid .'/edit');
    +
    +     $this->assertPattern('!<input[^>]+name="path"[^>]+value="'. $expected_alias .'"!', 'Proper automated alias generated.', 'Functionality test');
    +     // Look for checkbox.
    +     $this->assertPattern('!<input[^>]+name="pathauto_perform_alias"[^>]+checked="checked"!', 'Automated alias turned on.', 'Functionality test');
    +
    +     // Check whether the alias actually works.
    +     $this->drupalGet($expected_alias);
    +     $this->assertRaw($edit['title'], 'Node accessible through alias.', 'Functionality test');
    ++>>>>>>> origin/master:sites/all/modules/pathauto/tests/pathauto.test
    }
    }
    diff --cc sites/all/modules/pathauto/translations/hu.po
    index 077b972,33f1f7f..40a0a3a
    --- a/sites/all/modules/pathauto/translations/hu.po
    +++ b/sites/all/modules/pathauto/translations/hu.po
    @@@ -1,309 -1,788 +1,1078 @@@
    ++<<<<<<< HEAD:sites/all/modules/pathauto/translations/hu.po
    +# Hungarian translation of Pathauto (6.x-1.2)
    +# Copyright (c) 2009 by the Hungarian translation team
    +#
    +msgid ""
    +msgstr ""
    +"Project-Id-Version: Pathauto (6.x-1.2)\n"
    +"POT-Creation-Date: 2009-12-01 20:36+0000\n"
    +"PO-Revision-Date: 2009-12-01 10:48+0000\n"
    +"Language-Team: Hungarian\n"
    ++=======
    + # Hungarian translation of pathauto (6.x-1.1)
    + # Copyright (c) 2009 by the Hungarian translation team
    + # Generated from files:
    + #  pathauto.module,v 1.118 2008/06/20 20:01:01 greggles
    + #  pathauto.admin.inc,v 1.10.2.1 2008/06/24 16:07:51 greggles
    + #  pathauto_node.inc,v 1.47 2008/06/10 21:41:53 freso
    + #  pathauto.inc,v 1.45 2008/06/18 20:02:40 greggles
    + #  pathauto.info,v 1.4 2007/10/28 21:06:13 greggles
    + #  pathauto_taxonomy.inc,v 1.39 2008/06/10 21:41:53 freso
    + #  pathauto_user.inc,v 1.28 2008/05/28 16:04:35 freso
    + #
    + msgid ""
    + msgstr ""
    + "Project-Id-Version: pathauto (6.x-1.1)\n"
    + "POT-Creation-Date: 2009-02-16 18:11-0600\n"
    + "PO-Revision-Date: 2009-02-13 13:52-0600\n"
    + "Last-Translator: Balogh Zoltán\n"
    + "Language-Team: Hungarian http://forditas.mindworks.hu\n"
    ++>>>>>>> origin/master:sites/all/modules/pathauto/translations/hu.po
    "MIME-Version: 1.0\n"
    "Content-Type: text/plain; charset=utf-8\n"
    "Content-Transfer-Encoding: 8bit\n"
    "Plural-Forms: nplurals=2; plural=(n!=1);\n"
    
    ++<<<<<<< HEAD:sites/all/modules/pathauto/translations/hu.po
    +msgid "content"
    +msgstr "tartalom"
    +msgid "Remove"
    +msgstr "Eltávolítás"
    +msgid "General settings"
    +msgstr "Általános beállítások"
    +msgid "forums"
    +msgstr "fórumok"
    +msgid "Separator"
    +msgstr "Elválasztó"
    +msgid "Node path settings"
    +msgstr "Tartalomútvonalak beállításai"
    +msgid ""
    +"Default path pattern (applies to all node types with blank patterns "
    +"below)"
    +msgstr ""
    +"Alapértelmezés szerinti útvonal minta (felhasználja minden olyan "
    +"tartalomtípushoz, amelynek Ìres a mintája lejjebb)"
    +msgid ""
    +"Generate aliases for all existing nodes which do not already have "
    +"aliases."
    +msgstr ""
    +"Álnevek létrehozása minden olyan tartalomhoz, amely még nem "
    +"rendelkezik álnévvel."
    +msgid ""
    +"Default path pattern (applies to all vocabularies with blank patterns "
    +"below)"
    +msgstr ""
    +"Alapértelmezés szerinti útvonalminta (felhasználja minden olyan "
    +"szótárhoz, amelynek Ìres a mintája lejjebb)"
    +msgid "Pattern for all %vocab-name paths"
    +msgstr "Minta minden %vocab-name útvonalnak"
    +msgid "Forum path settings"
    +msgstr "Fórumútvonalak beállításai"
    +msgid "Pattern for forums and forum containers"
    +msgstr "Minta fórumoknak és fórum csoportoknak"
    +msgid ""
    +"Generate aliases for all existing forums and forum containers which do "
    +"not already have aliases."
    +msgstr ""
    +"Álnevek létrehozása minden olyan fórumhoz és fórum csoporthoz, "
    +"amely még nem rendelkezik álnévvel."
    +msgid ""
    +"Bulk update of forums and forum containers completed, one alias "
    +"generated."
    +msgid_plural ""
    +"Bulk update of forums and forum containers completed, @count aliases "
    +"generated."
    +msgstr[0] ""
    +"A fórumok és fórumcsoportok tömeges módosítása sikeresen "
    +"befejeződött, egy álnév jött létre."
    +msgstr[1] ""
    +"A fórumok és fórumcsoportok tömeges módosítása sikeresen "
    +"befejeződött, @count álnév jött létre."
    +msgid "User path settings"
    +msgstr "Felhasználói útvonalak beállításai"
    +msgid "Pattern for user account page paths"
    +msgstr "Minta a felhasználói fiók útvonalakhoz"
    +msgid ""
    +"Generate aliases for all existing user account pages which do not "
    +"already have aliases."
    +msgstr ""
    +"Álnevek létrehozása minden olyan felhasználói fiókhoz, amely "
    +"még nem rendelkezik álnévvel."
    +msgid "Blog path settings"
    +msgstr "Blog útvonalak beállításai"
    +msgid "Pattern for blog page paths"
    +msgstr "Minta a blog oldal útvonalakhoz"
    +msgid ""
    +"Generate aliases for all existing blog pages which do not already have "
    +"aliases."
    +msgstr ""
    +"Álnevek létrehozása minden olyan blog oldalhoz, amely még nem "
    +"rendelkezik álnévvel."
    +msgid "User-tracker path settings"
    +msgstr "Felhasználó-követő útvonalak beállításai"
    +msgid "Pattern for user-tracker page paths"
    +msgstr "Minta a felhasználó-követő oldalak útvonalainak"
    +msgid ""
    +"Generate aliases for all existing user-tracker pages which do not "
    +"already have aliases."
    +msgstr ""
    +"Álnevek létrehozása minden olyan felhasználó-követő oldalhoz, "
    +"amely még nem rendelkezik álnévvel."
    +msgid "Verbose"
    +msgstr "Bőbeszédűen"
    ++=======
    + #: pathauto.module:188
    + msgid "content"
    + msgstr "tartalom"
    +
    + #: pathauto.admin.inc:161
    + msgid "Remove"
    + msgstr "Eltávolítás"
    +
    + #: pathauto_node.inc:79,37
    + msgid "Language neutral"
    + msgstr "NyelvfÃŒggetlen"
    +
    + #: pathauto.admin.inc:38
    + msgid "General settings"
    + msgstr "Általános beállítások"
    +
    + #: pathauto.admin.inc:53
    + msgid "Separator"
    + msgstr "Elválasztó"
    +
    + #: pathauto.admin.inc:239
    + msgid "Replacement patterns"
    + msgstr "Helyettesítési minták"
    +
    + #: pathauto.admin.inc:22
    + msgid ""
    + "It appears that the <a href=\"@token_link\">Token module</a> is not "
    + "installed. Please ensure that you have it installed so that Pathauto "
    + "can work properly. You may need to disable Pathauto and re-enable it "
    + "to get Token enabled."
    + msgstr ""
    + "A <a href=\"@token_link\"><em>Token</em> modul</a> valószínűleg "
    + "nincs telepítve. E nélkÌl a <em>Pathauto</em> modul nem tud "
    + "helyesen működni. A <em>Pathauto</em> modult le kell tiltani, majd "
    + "ismételten engedélyezni kell a <em>Token</em> modul engedélyezése "
    + "után."
    +
    + #: pathauto.admin.inc:46
    + msgid "Verbose"
    + msgstr "Bőbeszédűen"
    +
    + #: pathauto.admin.inc:48
    ++>>>>>>> origin/master:sites/all/modules/pathauto/translations/hu.po
    msgid "Display alias changes (except during bulk updates)."
    msgstr ""
    "Álnévváltoztatások megjelenítése (kivéve a tömeges "
    "módosítást)"
    ++<<<<<<< HEAD:sites/all/modules/pathauto/translations/hu.po
    +msgid "Replace by separator"
    +msgstr "Helyettesíti az elválasztóval"
    +msgid "Maximum alias length"
    +msgstr "Az álnév legnagyobb hossza"
    +msgid "Maximum component leng…
    Bèr Kessels committed Mar 9, 2010
  3. updated core with drupal.rb

    Bèr Kessels committed Mar 9, 2010
  4. Drush automated update of contrib

    Bèr Kessels committed Mar 9, 2010
  5. adding ignore list

    Bèr Kessels committed Mar 9, 2010
  6. removed drush from git. Drush must be installed on machine, not in dr…

    …upal.
    Bèr Kessels committed Mar 9, 2010
Commits on Feb 8, 2010
  1. Updated Drupal core to 6.15

    Bèr Kessels committed Feb 8, 2010
Commits on Nov 16, 2009
  1. upgrade of drupalcore to 6.14

    Bèr Kessels committed Nov 16, 2009
  2. drush update of contribs

    Bèr Kessels committed Nov 16, 2009
  3. fixing a minor bug: default site title set correctly now.

    Bèr Kessels committed Nov 16, 2009
  4. events introduced: with date module, event node-type and other relate…

    …d install stuff
    Bèr Kessels committed Nov 16, 2009
  5. Adding date module.

    Bèr Kessels committed Nov 16, 2009
Commits on Nov 6, 2009
  1. import from SVN/unfuddle.

    Bèr Kessels committed Nov 6, 2009