Merge lp:pressflow into lp:~pdrakeweb/pressflow/loadcache

[Peter]

Merge in pressflow 6.22.104.

Merge in pressflow 6.22.104.

[Peter (pdrakeweb)]

review: Approve

=== modified file '.htaccess'
--- .htaccess	2010-03-04 05:59:51 +0000
+++ .htaccess	2011-07-29 12:42:31 +0000
@@ -113,4 +113,4 @@
   RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
 </IfModule>
 
-# $Id: .htaccess,v 1.90.2.5 2010/02/02 07:25:22 dries Exp $
+# $Id$

=== modified file 'CHANGELOG.txt'
--- CHANGELOG.txt	2010-12-16 19:28:18 +0000
+++ CHANGELOG.txt	2011-07-29 12:42:31 +0000
@@ -1,4 +1,14 @@
-// $Id: CHANGELOG.txt,v 1.253.2.43 2010/12/15 21:11:22 goba Exp $
+
+Drupal 6.22, 2011-05-25
+----------------------
+- Made Drupal 6 work better with IIS and Internet Explorer.
+- Fixed .po file imports to work better with custom textgroups.
+- Improved code documentation at various places.
+- Fixed a variety of other bugs.
+
+Drupal 6.21, 2011-05-25
+----------------------
+- Fixed security issues (Cross site scripting), see SA-CORE-2011-001.
 
 Drupal 6.20, 2010-12-15
 ----------------------

=== modified file 'COPYRIGHT.txt'
--- COPYRIGHT.txt	2010-08-11 20:54:17 +0000
+++ COPYRIGHT.txt	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: COPYRIGHT.txt,v 1.2.2.3 2010/08/06 10:58:29 goba Exp $
 
 All Drupal code is Copyright 2001 - 2010 by the original authors.
 

=== modified file 'INSTALL.mysql.txt'
--- INSTALL.mysql.txt	2008-12-06 09:02:33 +0000
+++ INSTALL.mysql.txt	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: INSTALL.mysql.txt,v 1.10 2007/11/19 19:53:51 goba Exp $
 
 CREATE THE MySQL DATABASE
 --------------------------

=== modified file 'INSTALL.pgsql.txt'
--- INSTALL.pgsql.txt	2008-12-06 09:02:33 +0000
+++ INSTALL.pgsql.txt	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: INSTALL.pgsql.txt,v 1.7 2007/11/26 16:36:42 dries Exp $
 
 CREATE THE PostgreSQL DATABASE
 ------------------------------

=== modified file 'INSTALL.txt'
--- INSTALL.txt	2010-12-16 19:28:18 +0000
+++ INSTALL.txt	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: INSTALL.txt,v 1.61.2.5 2010/12/06 06:50:55 goba Exp $
 
 CONTENTS OF THIS FILE
 ---------------------

=== modified file 'LICENSE.txt'
--- LICENSE.txt	2009-01-15 00:30:06 +0000
+++ LICENSE.txt	2011-07-29 12:42:31 +0000
@@ -1,340 +1,274 @@
-// $Id: LICENSE.txt,v 1.5.4.1 2009/01/06 17:27:13 goba Exp $
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+GNU GENERAL PUBLIC LICENSE
+
+              Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
+Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
+verbatim copies of this license document, but changing it is not allowed.
+
+                  Preamble
+
+The licenses for most software are designed to take away your freedom to
+share and change it. By contrast, the GNU General Public License is
+intended to guarantee your freedom to share and change free software--to
+make sure the software is free for all its users. This General Public License
+applies to most of the Free Software Foundation's software and to any other
+program whose authors commit to using it. (Some other Free Software
+Foundation software is covered by the GNU Library General Public License
+instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our
+General Public Licenses are designed to make sure that you have the
+freedom to distribute copies of free software (and charge for this service if
+you wish), that you receive source code or can get it if you want it, that you
+can change the software or use pieces of it in new free programs; and that
+you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to
+deny you these rights or to ask you to surrender the rights. These restrictions
+translate to certain responsibilities for you if you distribute copies of the
+software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for
+a fee, you must give the recipients all the rights that you have. You must make
+sure that they, too, receive or can get the source code. And you must show
+them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2)
+offer you this license which gives you legal permission to copy, distribute
+and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that
+everyone understands that there is no warranty for this free software. If the
+software is modified by someone else and passed on, we want its recipients
+to know that what they have is not the original, so that any problems
+introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We
+wish to avoid the danger that redistributors of a free program will individually
+obtain patent licenses, in effect making the program proprietary. To prevent
+this, we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification
+follow.
+
+           GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
+               MODIFICATION
+
+0. This License applies to any program or other work which contains a notice
+placed by the copyright holder saying it may be distributed under the terms
+of this General Public License. The "Program", below, refers to any such
+program or work, and a "work based on the Program" means either the
+Program or any derivative work under copyright law: that is to say, a work
+containing the Program or a portion of it, either verbatim or with
+modifications and/or translated into another language. (Hereinafter, translation
+is included without limitation in the term "modification".) Each licensee is
+addressed as "you".
+
+Activities other than copying, distribution and modification are not covered
+by this License; they are outside its scope. The act of running the Program is
+not restricted, and the output from the Program is covered only if its contents
+constitute a work based on the Program (independent of having been made
+by running the Program). Whether that is true depends on what the Program
+does.
+
+1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this License
+and to the absence of any warranty; and give any other recipients of the
+Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you
+may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it,
+thus forming a work based on the Program, and copy and distribute such
+modifications or work under the terms of Section 1 above, provided that you
+also meet all of these conditions:
+
+a) You must cause the modified files to carry prominent notices stating that
+you changed the files and the date of any change.
+
+b) You must cause any work that you distribute or publish, that in whole or in
+part contains or is derived from the Program or any part thereof, to be
+licensed as a whole at no charge to all third parties under the terms of this
+License.
+
+c) If the modified program normally reads commands interactively when run,
+you must cause it, when started running for such interactive use in the most
+ordinary way, to print or display an announcement including an appropriate
+copyright notice and a notice that there is no warranty (or else, saying that
+you provide a warranty) and that users may redistribute the program under
+these conditions, and telling the user how to view a copy of this License.
+(Exception: if the Program itself is interactive but does not normally print such
+an announcement, your work based on the Program is not required to print
+an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable
+sections of that work are not derived from the Program, and can be
+reasonably considered independent and separate works in themselves, then
+this License, and its terms, do not apply to those sections when you distribute
+them as separate works. But when you distribute the same sections as part
+of a whole which is a work based on the Program, the distribution of the
+whole must be on the terms of this License, whose permissions for other
+licensees extend to the entire whole, and thus to each and every part
+regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to
+work written entirely by you; rather, the intent is to exercise the right to
+control the distribution of derivative or collective works based on the
+Program.
 
 In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+with the Program (or with a work based on the Program) on a volume of a
+storage or distribution medium does not bring the other work under the scope
+of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under
+Section 2) in object code or executable form under the terms of Sections 1
+and 2 above provided that you also do one of the following:
+
+a) Accompany it with the complete corresponding machine-readable source
+code, which must be distributed under the terms of Sections 1 and 2 above
+on a medium customarily used for software interchange; or,
+
+b) Accompany it with a written offer, valid for at least three years, to give
+any third party, for a charge no more than your cost of physically performing
+source distribution, a complete machine-readable copy of the corresponding
+source code, to be distributed under the terms of Sections 1 and 2 above on
+a medium customarily used for software interchange; or,
+
+c) Accompany it with the information you received as to the offer to distribute
+corresponding source code. (This alternative is allowed only for
+noncommercial distribution and only if you received the program in object
+code or executable form with such an offer, in accord with Subsection b
+above.)
 
 The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
+making modifications to it. For an executable work, complete source code
+means all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation and
+installation of the executable. However, as a special exception, the source
+code distributed need not include anything that is normally distributed (in
+either source or binary form) with the major components (compiler, kernel,
+and so on) of the operating system on which the executable runs, unless that
+component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to
+copy from a designated place, then offering equivalent access to copy the
+source code from the same place counts as distribution of the source code,
+even though third parties are not compelled to copy the source along with the
+object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as
+expressly provided under this License. Any attempt otherwise to copy,
+modify, sublicense or distribute the Program is void, and will automatically
+terminate your rights under this License. However, parties who have received
+copies, or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it.
+However, nothing else grants you permission to modify or distribute the
+Program or its derivative works. These actions are prohibited by law if you
+do not accept this License. Therefore, by modifying or distributing the
+Program (or any work based on the Program), you indicate your acceptance
+of this License to do so, and all its terms and conditions for copying,
+distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these terms and
+conditions. You may not impose any further restrictions on the recipients'
+exercise of the rights granted herein. You are not responsible for enforcing
+compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues), conditions
+are imposed on you (whether by court order, agreement or otherwise) that
+contradict the conditions of this License, they do not excuse you from the
+conditions of this License. If you cannot distribute so as to satisfy
+simultaneously your obligations under this License and any other pertinent
+obligations, then as a consequence you may not distribute the Program at all.
+For example, if a patent license would not permit royalty-free redistribution
+of the Program by all those who receive copies directly or indirectly through
+you, then the only way you could satisfy both it and this License would be to
 refrain entirely from distribution of the Program.
 
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply and
+the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or
+other property right claims or to contest validity of any such claims; this
+section has the sole purpose of protecting the integrity of the free software
+distribution system, which is implemented by public license practices. Many
+people have made generous contributions to the wide range of software
+distributed through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing to
+distribute software through any other system and a licensee cannot impose
+that choice.
+
+This section is intended to make thoroughly clear what is believed to be a
+consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain
+countries either by patents or by copyrighted interfaces, the original copyright
+holder who places the Program under this License may add an explicit
+geographical distribution limitation excluding those countries, so that
+distribution is permitted only in or among countries not thus excluded. In such
+case, this License incorporates the limitation as if written in the body of this
+License.
+
+9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will be
+similar in spirit to the present version, but may differ in detail to address new
+problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies
+a version number of this License which applies to it and "any later version",
+you have the option of following the terms and conditions either of that
+version or of any later version published by the Free Software Foundation. If
+the Program does not specify a version number of this License, you may
+choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs
+whose distribution conditions are different, write to the author to ask for
+permission. For software which is copyrighted by the Free Software
+Foundation, write to the Free Software Foundation; we sometimes make
+exceptions for this. Our decision will be guided by the two goals of
+preserving the free status of all derivatives of our free software and of
+promoting the sharing and reuse of software generally.
+
+               NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
+PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
+NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
+AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
+ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
+LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE
+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE OR LOSSES
+SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
+IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGES.
+
+          END OF TERMS AND CONDITIONS

=== modified file 'MAINTAINERS.txt'
--- MAINTAINERS.txt	2009-04-30 00:36:53 +0000
+++ MAINTAINERS.txt	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: MAINTAINERS.txt,v 1.19.2.2 2009/04/29 17:15:10 goba Exp $
 
 List of maintainers
 --------------------------------------------------------------------------------

=== modified file 'UPGRADE.txt'
--- UPGRADE.txt	2010-06-02 20:30:18 +0000
+++ UPGRADE.txt	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: UPGRADE.txt,v 1.12.2.1 2010/05/11 09:39:36 goba Exp $
 
 UPGRADING
 ---------

=== modified file 'cron.php'
--- cron.php	2008-12-06 09:02:33 +0000
+++ cron.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: cron.php,v 1.36 2006/08/09 07:42:55 dries Exp $
 
 /**
  * @file

=== modified file 'includes/actions.inc'
--- includes/actions.inc	2010-08-11 20:54:17 +0000
+++ includes/actions.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: actions.inc,v 1.8.2.13 2010/08/11 20:35:47 goba Exp $
 
 /**
  * @file

=== modified file 'includes/batch.inc'
--- includes/batch.inc	2010-08-11 21:05:18 +0000
+++ includes/batch.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: batch.inc,v 1.14.2.1 2010/08/06 11:52:19 goba Exp $
 
 /**
  * @file Batch processing API for processes to run in multiple HTTP requests.
@@ -245,7 +244,7 @@
       '@percentage' => $percentage,
       );
     $message = strtr($progress_message, $values) .'<br/>';
-    $message .= $task_message ? $task_message : '&nbsp';
+    $message .= $task_message ? $task_message : '&nbsp;';
 
     return array($percentage, $message);
   }

=== modified file 'includes/bootstrap.inc'
--- includes/bootstrap.inc	2010-12-16 19:39:23 +0000
+++ includes/bootstrap.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: bootstrap.inc,v 1.206.2.31 2010/12/15 13:21:14 goba Exp $
 
 /**
  * @file

=== modified file 'includes/cache-install.inc'
--- includes/cache-install.inc	2008-12-06 09:02:33 +0000
+++ includes/cache-install.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: cache-install.inc,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * A stub cache implementation to be used during the installation

=== modified file 'includes/cache.inc'
--- includes/cache.inc	2011-02-02 21:19:00 +0000
+++ includes/cache.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: cache.inc,v 1.17.2.5 2010/11/03 19:07:46 goba Exp $
 
 /**
  * Return data from the persistent cache. Data may be stored as either plain text or as serialized data.

=== modified file 'includes/common.inc'
--- includes/common.inc	2011-02-02 21:19:00 +0000
+++ includes/common.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: common.inc,v 1.756.2.106 2010/12/15 21:11:22 goba Exp $
 
 /**
  * @file
@@ -194,7 +193,7 @@
 }
 
 /**
- * @name HTTP handling
+ * @defgroup http_handling HTTP handling
  * @{
  * Functions to properly handle HTTP responses.
  */
@@ -646,7 +645,7 @@
       }
     }
 
-    $entry = $types[$errno] .': '. $message .' in '. $filename .' on line '. $line .'.';
+    $entry = check_plain($types[$errno]) .': '. filter_xss($message) .' in '. check_plain($filename) .' on line '. check_plain($line) .'.';
 
     // Force display of error messages in update.php.
     if (variable_get('error_level', 1) == 1 || strstr($_SERVER['SCRIPT_NAME'], 'update.php')) {
@@ -1637,7 +1636,8 @@
  *   A linear array.
  * @param $function
  *   A name of a function to apply to all values before output.
- * @result
+ *
+ * @return
  *   An associative array.
  */
 function drupal_map_assoc($array, $function = NULL) {

=== modified file 'includes/database.inc'
--- includes/database.inc	2010-12-16 19:39:23 +0000
+++ includes/database.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: database.inc,v 1.92.2.11 2010/11/03 14:02:33 goba Exp $
 
 /**
  * @file

=== modified file 'includes/database.mysql-common.inc'
--- includes/database.mysql-common.inc	2010-12-16 19:28:18 +0000
+++ includes/database.mysql-common.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: database.mysql-common.inc,v 1.17.2.5 2010/12/15 13:21:14 goba Exp $
 
 /**
  * @file
@@ -290,7 +289,7 @@
  *   table along with adding the field. The format is the same as a
  *   table specification but without the 'fields' element.  If you are
  *   adding a type 'serial' field, you MUST specify at least one key
- *   or index including it in this array. @see db_change_field for more
+ *   or index including it in this array. See db_change_field() for more
  *   explanation why.
  */
 function db_add_field(&$ret, $table, $field, $spec, $keys_new = array()) {

=== modified file 'includes/database.mysql.inc'
--- includes/database.mysql.inc	2010-12-16 19:39:23 +0000
+++ includes/database.mysql.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: database.mysql.inc,v 1.89.2.4 2010/12/15 20:41:10 goba Exp $
 
 /**
  * @file

=== modified file 'includes/database.mysqli.inc'
--- includes/database.mysqli.inc	2010-12-16 19:39:23 +0000
+++ includes/database.mysqli.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: database.mysqli.inc,v 1.54.2.4 2010/12/15 20:41:10 goba Exp $
 
 /**
  * @file

=== modified file 'includes/database.pgsql.inc'
--- includes/database.pgsql.inc	2010-12-16 19:39:23 +0000
+++ includes/database.pgsql.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: database.pgsql.inc,v 1.68.2.11 2010/12/15 20:41:10 goba Exp $
 
 /**
  * @file
@@ -720,7 +719,7 @@
  *   table along with adding the field. The format is the same as a
  *   table specification but without the 'fields' element.  If you are
  *   adding a type 'serial' field, you MUST specify at least one key
- *   or index including it in this array. @see db_change_field for more
+ *   or index including it in this array. See db_change_field() for more
  *   explanation why.
  */
 function db_add_field(&$ret, $table, $field, $spec, $new_keys = array()) {

=== modified file 'includes/file.inc'
--- includes/file.inc	2010-12-16 19:39:23 +0000
+++ includes/file.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: file.inc,v 1.121.2.14 2010/12/13 19:02:09 goba Exp $
 
 /**
  * @file
@@ -121,17 +120,28 @@
 }
 
 /**
- * Check that the directory exists and is writable. Directories need to
- * have execute permissions to be considered a directory by FTP servers, etc.
- *
- * @param $directory A string containing the name of a directory path.
- * @param $mode A Boolean value to indicate if the directory should be created
- *   if it does not exist or made writable if it is read-only.
- * @param $form_item An optional string containing the name of a form item that
- *   any errors will be attached to. This is useful for settings forms that
- *   require the user to specify a writable directory. If it can't be made to
- *   work, a form error will be set preventing them from saving the settings.
- * @return FALSE when directory not found, or TRUE when directory exists.
+ * Checks whether a directory exists and is writable.
+ *
+ * Furthermore, the directory can optionally be created if it does not exist,
+ * and/or be set to writable if it is currently not. Directories need to have
+ * execute permission to be considered a directory by FTP servers.
+ *
+ * @param $directory
+ *   A string representing the directory path.
+ * @param $mode
+ *   An optional bitmask containing the actions, if any, to be carried out on
+ *   the directory. Any combination of the actions FILE_CREATE_DIRECTORY and
+ *   FILE_MODIFY_PERMISSIONS is allowed.
+ * @param $form_item
+ *   An optional string containing the name of a form item that any errors
+ *   will be attached to. Useful when the function validates a directory path
+ *   entered as a form value. An error will consequently prevent form submit
+ *   handlers from running, and instead display the form along with the
+ *   error messages.
+ *
+ * @return
+ *   FALSE if the directory does not exist or is not writable, even after
+ *   any optional actions have been carried out. Otherwise, TRUE is returned.
  */
 function file_check_directory(&$directory, $mode = 0, $form_item = NULL) {
   $directory = rtrim($directory, '/\\');
@@ -696,9 +706,12 @@
  * @param $file
  *   A Drupal file object.
  * @param $extensions
- *   A string with a space separated
+ *   A string with a space separated list of allowed file extensions, not
+ *   including the period. For example, 'bmp jpg gif png'.
+ *
  * @return
- *   An array. If the file extension is not allowed, it will contain an error message.
+ *   An array. If the file extension is not allowed, it will contain an error
+ *   message.
  */
 function file_validate_extensions($file, $extensions) {
   global $user;
@@ -879,6 +892,14 @@
   if (ob_get_level()) {
     ob_end_clean();
   }
+  
+  // IE cannot download private files because it cannot store files downloaded
+  // over https in the browser cache. The problem can be solved by sending
+  // custom headers to IE. See http://support.microsoft.com/kb/323308/en-us
+  if (isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on')) {
+    drupal_set_header('Cache-Control: private');
+    drupal_set_header('Pragma: private');
+  }
 
   foreach ($headers as $header) {
     // To prevent HTTP header injection, we delete new lines that are

=== modified file 'includes/form.inc'
--- includes/form.inc	2011-02-02 21:19:00 +0000
+++ includes/form.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: form.inc,v 1.265.2.35 2010/11/04 09:55:29 goba Exp $
 
 /**
  * @defgroup forms Form builder functions

=== modified file 'includes/image.gd.inc'
--- includes/image.gd.inc	2008-12-06 09:02:33 +0000
+++ includes/image.gd.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: image.gd.inc,v 1.4 2008/01/15 10:17:42 goba Exp $
 
 /**
  * @file

=== modified file 'includes/image.inc'
--- includes/image.inc	2010-12-16 19:28:18 +0000
+++ includes/image.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: image.inc,v 1.24.2.1 2010/12/15 14:08:17 goba Exp $
 
 /**
  * @file
@@ -114,7 +113,9 @@
  *    'file_size' - File size in bytes.
  */
 function image_get_info($file) {
-  if (!is_file($file) && !is_uploaded_file($filepath)) {
+  // Proceed no further if this file doesn't exist. Some web servers (IIS) may
+  // not pass is_file() for newly uploaded files, so we need two checks here.
+  if (!is_file($file) && !is_uploaded_file($file)) {
     return FALSE;
   }
 

=== modified file 'includes/install.inc'
--- includes/install.inc	2009-02-25 22:34:15 +0000
+++ includes/install.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: install.inc,v 1.56.2.4 2009/02/16 10:25:02 goba Exp $
 
 define('SCHEMA_UNINSTALLED', -1);
 define('SCHEMA_INSTALLED', 0);

=== modified file 'includes/install.mysql.inc'
--- includes/install.mysql.inc	2008-12-06 09:02:33 +0000
+++ includes/install.mysql.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: install.mysql.inc,v 1.9 2008/01/23 09:59:29 goba Exp $
 
 // MySQL specific install functions
 

=== modified file 'includes/install.mysqli.inc'
--- includes/install.mysqli.inc	2008-12-06 09:02:33 +0000
+++ includes/install.mysqli.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: install.mysqli.inc,v 1.12 2008/01/23 09:59:29 goba Exp $
 
 // MySQLi specific install functions
 

=== modified file 'includes/install.pgsql.inc'
--- includes/install.pgsql.inc	2008-12-06 09:02:33 +0000
+++ includes/install.pgsql.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: install.pgsql.inc,v 1.6 2007/10/22 15:22:39 dries Exp $
 
 // PostgreSQL specific install functions
 

=== modified file 'includes/language.inc'
--- includes/language.inc	2010-06-02 20:30:18 +0000
+++ includes/language.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: language.inc,v 1.14.2.2 2010/03/22 12:18:04 goba Exp $
 
 /**
  * @file

=== modified file 'includes/locale.inc'
--- includes/locale.inc	2010-08-11 21:05:18 +0000
+++ includes/locale.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: locale.inc,v 1.174.2.14 2010/08/11 19:42:26 goba Exp $
 
 /**
  * @file
@@ -1672,7 +1671,7 @@
       break;
     }
   }
-  return substr($comm, 0, -2);
+  return trim(substr($comm, 0, -2));
 }
 
 /**

=== modified file 'includes/lock.inc'
--- includes/lock.inc	2010-06-02 20:30:18 +0000
+++ includes/lock.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: lock.inc,v 1.1.2.4 2010/05/11 09:30:20 goba Exp $
 
 /**
  * @file

=== modified file 'includes/mail.inc'
--- includes/mail.inc	2010-06-14 21:58:50 +0000
+++ includes/mail.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: mail.inc,v 1.8.2.8 2010/06/02 12:07:24 goba Exp $
 
 /**
  * Compose and optionally send an e-mail message.

=== modified file 'includes/menu.inc'
--- includes/menu.inc	2010-12-16 19:39:23 +0000
+++ includes/menu.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: menu.inc,v 1.255.2.38 2010/12/09 11:57:18 goba Exp $
 
 /**
  * @file
@@ -72,7 +71,7 @@
  */
 
 /**
- * @name Menu flags
+ * @defgroup menu_flags Menu flags
  * @{
  * Flags for use in the "type" attribute of menu items.
  */
@@ -90,8 +89,10 @@
  */
 
 /**
- * @name Menu item types
+ * @defgroup menu_item_types Menu item types
  * @{
+ * Definitions for various menu item types.
+ *
  * Menu item definitions provide one of these constants, which are shortcuts for
  * combinations of the above flags.
  */
@@ -135,7 +136,7 @@
  */
 
 /**
- * @name Menu status codes
+ * @defgroup menu_status_codes Menu status codes
  * @{
  * Status codes for menu callbacks.
  */
@@ -150,9 +151,9 @@
  */
 
 /**
- * @Name Menu tree parameters
+ * @defgroup menu_tree_parameters Menu tree parameters
  * @{
- * Menu tree
+ * Parameters for a menu tree.
  */
 
  /**

=== modified file 'includes/module.inc'
--- includes/module.inc	2010-12-16 19:28:18 +0000
+++ includes/module.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: module.inc,v 1.115.2.5 2010/12/15 14:50:25 goba Exp $
 
 /**
  * @file

=== modified file 'includes/pager.inc'
--- includes/pager.inc	2009-07-01 22:36:49 +0000
+++ includes/pager.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: pager.inc,v 1.63.2.1 2009/07/01 20:51:55 goba Exp $
 
 /**
  * @file
@@ -227,10 +226,11 @@
 
 
 /**
- * @name Pager pieces
+ * @defgroup pagerpieces Pager pieces
  * @{
- * Use these pieces to construct your own custom pagers in your theme. Note that
- * you should NOT modify this file to customize your pager.
+ * Theme functions for customizing pager elements.
+ *
+ * Note that you should NOT modify this file to customize your pager.
  */
 
 /**

=== modified file 'includes/path.inc'
--- includes/path.inc	2011-02-02 21:19:00 +0000
+++ includes/path.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: path.inc,v 1.19.2.7 2010/11/04 10:27:46 goba Exp $
 
 /**
  * @file

=== modified file 'includes/session.inc'
--- includes/session.inc	2010-03-04 01:53:34 +0000
+++ includes/session.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: session.inc,v 1.44.2.7 2010/03/04 00:15:28 goba Exp $
 
 /**
  * @file

=== modified file 'includes/tablesort.inc'
--- includes/tablesort.inc	2009-07-01 22:33:52 +0000
+++ includes/tablesort.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: tablesort.inc,v 1.47.2.1 2009/07/01 20:51:55 goba Exp $
 
 /**
  * @file

=== modified file 'includes/theme.inc'
--- includes/theme.inc	2010-12-16 19:39:23 +0000
+++ includes/theme.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: theme.inc,v 1.415.2.28 2010/11/03 19:03:19 goba Exp $
 
 /**
  * @file
@@ -12,14 +11,27 @@
  */
 
 /**
- * @name Content markers
+ * @defgroup content_flags Content markers
  * @{
  * Markers used by theme_mark() and node_mark() to designate content.
  * @see theme_mark(), node_mark()
  */
-define('MARK_READ',    0);
-define('MARK_NEW',     1);
+
+/**
+ * Mark content as read.
+ */
+define('MARK_READ', 0);
+
+/**
+ * Mark content as being new.
+ */
+define('MARK_NEW', 1);
+
+/**
+ * Mark content as being updated.
+ */
 define('MARK_UPDATED', 2);
+
 /**
  * @} End of "Content markers".
  */

=== modified file 'includes/theme.maintenance.inc'
--- includes/theme.maintenance.inc	2010-03-04 01:53:34 +0000
+++ includes/theme.maintenance.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: theme.maintenance.inc,v 1.10.2.2 2010/03/04 00:15:28 goba Exp $
 
 /**
  * @file

=== modified file 'includes/unicode.inc'
--- includes/unicode.inc	2010-12-16 19:28:18 +0000
+++ includes/unicode.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: unicode.inc,v 1.29.2.2 2010/12/15 13:50:13 goba Exp $
 
 /**
  * Indicates an error during check for PHP unicode support.

=== modified file 'includes/xmlrpc.inc'
--- includes/xmlrpc.inc	2010-06-02 20:30:18 +0000
+++ includes/xmlrpc.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: xmlrpc.inc,v 1.47.2.6 2010/06/02 12:22:02 goba Exp $
 
 /**
  * @file

=== modified file 'includes/xmlrpcs.inc'
--- includes/xmlrpcs.inc	2010-06-02 20:30:18 +0000
+++ includes/xmlrpcs.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: xmlrpcs.inc,v 1.24.2.4 2010/06/02 12:52:07 goba Exp $
 
 /**
  * The main entry point for XML-RPC requests.

=== modified file 'index.php'
--- index.php	2008-12-06 09:02:33 +0000
+++ index.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: index.php,v 1.94 2007/12/26 08:46:48 dries Exp $
 
 /**
  * @file

=== modified file 'install.php'
--- install.php	2010-12-16 19:39:23 +0000
+++ install.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: install.php,v 1.113.2.13 2010/12/06 06:50:56 goba Exp $
 
 require_once './includes/install.inc';
 

=== modified file 'misc/ahah.js'
--- misc/ahah.js	2008-12-06 09:02:33 +0000
+++ misc/ahah.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: ahah.js,v 1.7.2.1 2008/02/11 14:46:27 goba Exp $
 
 /**
  * Provides AJAX-like page updating via AHAH (Asynchronous HTML and HTTP).

=== modified file 'misc/autocomplete.js'
--- misc/autocomplete.js	2008-12-06 09:02:33 +0000
+++ misc/autocomplete.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: autocomplete.js,v 1.23 2008/01/04 11:53:21 goba Exp $
 
 /**
  * Attaches the autocomplete behavior to all required fields

=== modified file 'misc/batch.js'
--- misc/batch.js	2008-12-06 09:02:33 +0000
+++ misc/batch.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: batch.js,v 1.4 2007/10/21 18:59:01 goba Exp $
 
 /**
  * Attaches the batch behavior to progress bars.

=== modified file 'misc/collapse.js'
--- misc/collapse.js	2008-12-06 09:02:33 +0000
+++ misc/collapse.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: collapse.js,v 1.17 2008/01/29 10:58:25 goba Exp $
 
 /**
  * Toggle the visibility of a fieldset using smooth animations

=== modified file 'misc/drupal.js'
--- misc/drupal.js	2009-09-16 20:14:32 +0000
+++ misc/drupal.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: drupal.js,v 1.41.2.4 2009/07/21 08:59:10 goba Exp $
 
 var Drupal = Drupal || { 'settings': {}, 'behaviors': {}, 'themes': {}, 'locale': {} };
 

=== modified file 'misc/farbtastic/farbtastic.css'
--- misc/farbtastic/farbtastic.css	2008-12-06 09:02:33 +0000
+++ misc/farbtastic/farbtastic.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: farbtastic.css,v 1.3 2007/04/13 07:33:23 dries Exp $ */
 
 .farbtastic {
   position: relative;

=== modified file 'misc/farbtastic/farbtastic.js'
--- misc/farbtastic/farbtastic.js	2008-12-06 09:02:33 +0000
+++ misc/farbtastic/farbtastic.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: farbtastic.js,v 1.4.2.1 2008/06/25 09:34:17 goba Exp $
 // Farbtastic 1.2
 
 jQuery.fn.farbtastic = function (callback) {

=== modified file 'misc/form.js'
--- misc/form.js	2008-12-06 09:02:33 +0000
+++ misc/form.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: form.js,v 1.1 2007/09/12 18:29:32 goba Exp $
 
 Drupal.behaviors.multiselectSelector = function() {
   // Automatically selects the right radio button in a multiselect control.

=== modified file 'misc/jquery.form.js'
--- misc/jquery.form.js	2008-12-06 09:02:33 +0000
+++ misc/jquery.form.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: jquery.form.js,v 1.2 2007/11/19 10:05:48 goba Exp $
 
 /*
  * jQuery Form Plugin

=== modified file 'misc/jquery.js'
--- misc/jquery.js	2008-12-06 09:02:33 +0000
+++ misc/jquery.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: jquery.js,v 1.12.2.3 2008/06/25 09:38:39 goba Exp $ 
 
 /*
  * jQuery 1.2.6 - New Wave Javascript

=== modified file 'misc/print-rtl.css'
--- misc/print-rtl.css	2008-12-06 09:02:33 +0000
+++ misc/print-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: print-rtl.css,v 1.1 2007/06/10 08:55:55 goba Exp $ */
 
 body {
   direction: rtl;

=== modified file 'misc/print.css'
--- misc/print.css	2008-12-06 09:02:33 +0000
+++ misc/print.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: print.css,v 1.6 2007/06/10 08:55:55 goba Exp $ */
 
 body {
   margin: 1em;

=== modified file 'misc/progress.js'
--- misc/progress.js	2008-12-06 09:02:33 +0000
+++ misc/progress.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: progress.js,v 1.20 2008/01/04 11:53:21 goba Exp $
 
 /**
  * A progressbar object. Initialized with the given id. Must be inserted into

=== modified file 'misc/tabledrag.js'
--- misc/tabledrag.js	2009-07-01 22:33:52 +0000
+++ misc/tabledrag.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: tabledrag.js,v 1.13.2.5 2009/06/18 12:24:24 goba Exp $
 
 /**
  * Drag and drop table rows with field manipulation.

=== modified file 'misc/tableheader.js'
--- misc/tableheader.js	2009-04-30 00:36:53 +0000
+++ misc/tableheader.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: tableheader.js,v 1.16.2.2 2009/03/30 12:48:09 goba Exp $
 
 Drupal.tableHeaderDoScroll = function() {
   if (typeof(Drupal.tableHeaderOnScroll)=='function') {

=== modified file 'misc/tableselect.js'
--- misc/tableselect.js	2008-12-06 09:02:33 +0000
+++ misc/tableselect.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: tableselect.js,v 1.8 2007/11/19 12:15:16 goba Exp $
 
 Drupal.behaviors.tableSelect = function (context) {
   $('form table:has(th.select-all):not(.tableSelect-processed)', context).each(Drupal.tableSelect);

=== modified file 'misc/teaser.js'
--- misc/teaser.js	2010-03-04 01:32:05 +0000
+++ misc/teaser.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: teaser.js,v 1.12.2.2 2010/03/01 10:13:18 goba Exp $
 
 /**
  * Auto-attach for teaser behavior.

=== modified file 'misc/textarea.js'
--- misc/textarea.js	2008-12-06 09:02:33 +0000
+++ misc/textarea.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: textarea.js,v 1.22 2008/01/17 19:31:56 goba Exp $
 
 Drupal.behaviors.textarea = function(context) {
   $('textarea.resizable:not(.textarea-processed)', context).each(function() {

=== modified file 'modules/aggregator/aggregator-feed-source.tpl.php'
--- modules/aggregator/aggregator-feed-source.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/aggregator/aggregator-feed-source.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: aggregator-feed-source.tpl.php,v 1.1 2007/09/13 08:02:38 goba Exp $
 
 /**
  * @file aggregator-feed-source.tpl.php

=== modified file 'modules/aggregator/aggregator-item.tpl.php'
--- modules/aggregator/aggregator-item.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/aggregator/aggregator-item.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: aggregator-item.tpl.php,v 1.1 2007/09/13 08:02:38 goba Exp $
 
 /**
  * @file aggregator-item.tpl.php

=== modified file 'modules/aggregator/aggregator-rtl.css'
--- modules/aggregator/aggregator-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/aggregator/aggregator-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: aggregator-rtl.css,v 1.1 2007/05/27 17:57:47 goba Exp $ */
 
 #aggregator .feed-source .feed-icon {
   float: left;

=== modified file 'modules/aggregator/aggregator-summary-item.tpl.php'
--- modules/aggregator/aggregator-summary-item.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/aggregator/aggregator-summary-item.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: aggregator-summary-item.tpl.php,v 1.1 2007/09/13 08:02:38 goba Exp $
 
 /**
  * @file aggregator-summary-item.tpl.php

=== modified file 'modules/aggregator/aggregator-summary-items.tpl.php'
--- modules/aggregator/aggregator-summary-items.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/aggregator/aggregator-summary-items.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: aggregator-summary-items.tpl.php,v 1.1 2007/09/13 08:02:38 goba Exp $
 
 /**
  * @file aggregator-summary-items.tpl.php

=== modified file 'modules/aggregator/aggregator-wrapper.tpl.php'
--- modules/aggregator/aggregator-wrapper.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/aggregator/aggregator-wrapper.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: aggregator-wrapper.tpl.php,v 1.1 2007/09/13 08:02:38 goba Exp $
 
 /**
  * @file comment-wrapper.tpl.php

=== modified file 'modules/aggregator/aggregator.admin.inc'
--- modules/aggregator/aggregator.admin.inc	2008-12-06 09:02:33 +0000
+++ modules/aggregator/aggregator.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: aggregator.admin.inc,v 1.7.2.1 2008/04/25 21:11:57 goba Exp $
 
 /**
  * @file

=== modified file 'modules/aggregator/aggregator.css'
--- modules/aggregator/aggregator.css	2008-12-06 09:02:33 +0000
+++ modules/aggregator/aggregator.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: aggregator.css,v 1.2 2007/05/27 17:57:47 goba Exp $ */
 
 #aggregator .feed-source .feed-title {
   margin-top: 0;

=== modified file 'modules/aggregator/aggregator.info'
--- modules/aggregator/aggregator.info	2010-12-16 19:28:18 +0000
+++ modules/aggregator/aggregator.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: aggregator.info,v 1.4 2007/06/08 05:50:53 dries Exp $
 name = Aggregator
 description = "Aggregates syndicated content (RSS, RDF, and Atom feeds)."
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/aggregator/aggregator.install'
--- modules/aggregator/aggregator.install	2009-01-15 00:30:06 +0000
+++ modules/aggregator/aggregator.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: aggregator.install,v 1.14.2.2 2009/01/06 15:46:36 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/aggregator/aggregator.module'
--- modules/aggregator/aggregator.module	2010-06-02 20:30:18 +0000
+++ modules/aggregator/aggregator.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: aggregator.module,v 1.374.2.6 2010/05/28 16:06:59 goba Exp $
 
 /**
  * @file
@@ -783,6 +782,11 @@
       }
     }
 
+    // Resolve dc:creator tag as the item author if author tag is not set.
+    if (empty($item['AUTHOR']) && !empty($item['DC:CREATOR'])) {
+      $item['AUTHOR'] = $item['DC:CREATOR'];
+    }
+
     // Save this item. Try to avoid duplicate entries as much as possible. If
     // we find a duplicate entry, we resolve it and pass along its ID is such
     // that we can update it if needed.

=== modified file 'modules/aggregator/aggregator.pages.inc'
--- modules/aggregator/aggregator.pages.inc	2008-12-29 03:08:46 +0000
+++ modules/aggregator/aggregator.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: aggregator.pages.inc,v 1.12.2.1 2008/08/16 21:13:48 dries Exp $
 
 /**
  * @file

=== modified file 'modules/block/block-admin-display-form.tpl.php'
--- modules/block/block-admin-display-form.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/block/block-admin-display-form.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: block-admin-display-form.tpl.php,v 1.3 2008/01/16 22:57:26 goba Exp $
 
 /**
  * @file block-admin-display-form.tpl.php

=== modified file 'modules/block/block.admin.inc'
--- modules/block/block.admin.inc	2008-12-11 04:56:37 +0000
+++ modules/block/block.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: block.admin.inc,v 1.14.2.5 2008/11/24 06:00:02 dries Exp $
 
 /**
  * @file
@@ -386,6 +385,7 @@
       $variables['form'][$i]['region']['#attributes']['class'] = 'block-region-select block-region-'. $region;
       $variables['form'][$i]['weight']['#attributes']['class'] = 'block-weight block-weight-'. $region;
 
+      $variables['block_listing'][$region][$i] = new stdClass();
       $variables['block_listing'][$region][$i]->row_class = isset($block['#attributes']['class']) ? $block['#attributes']['class'] : '';
       $variables['block_listing'][$region][$i]->block_modified = isset($block['#attributes']['class']) && strpos($block['#attributes']['class'], 'block-modified') !== FALSE ? TRUE : FALSE;
       $variables['block_listing'][$region][$i]->block_title =  drupal_render($block['info']);

=== modified file 'modules/block/block.css'
--- modules/block/block.css	2008-12-06 09:02:33 +0000
+++ modules/block/block.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: block.css,v 1.6 2007/11/14 09:49:30 dries Exp $ */
 
 #blocks td.region {
   font-weight: bold;

=== modified file 'modules/block/block.info'
--- modules/block/block.info	2010-12-16 19:28:18 +0000
+++ modules/block/block.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: block.info,v 1.4 2007/06/08 05:50:53 dries Exp $
 name = Block
 description = Controls the boxes that are displayed around the main content.
 package = Core - required
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/block/block.install'
--- modules/block/block.install	2009-01-15 00:30:06 +0000
+++ modules/block/block.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: block.install,v 1.8.2.2 2009/01/06 15:46:36 goba Exp $
 
 /**
  * Implementation of hook_schema().

=== modified file 'modules/block/block.js'
--- modules/block/block.js	2008-12-06 09:02:33 +0000
+++ modules/block/block.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: block.js,v 1.2 2007/12/16 10:36:53 goba Exp $
 
 /**
  * Move a block in the blocks table from one region to another via select list.

=== modified file 'modules/block/block.module'
--- modules/block/block.module	2009-12-16 21:46:50 +0000
+++ modules/block/block.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: block.module,v 1.299.2.4 2009/10/06 12:13:01 goba Exp $
 
 /**
  * @file
@@ -224,15 +223,22 @@
 /**
  * Update the 'blocks' DB table with the blocks currently exported by modules.
  *
+ * @param $theme
+ *   The theme to rehash blocks for. If not provided, defaults to the currently
+ *   used theme.
+ *
  * @return
  *   Blocks currently exported by modules.
  */
-function _block_rehash() {
+function _block_rehash($theme = NULL) {
   global $theme_key;
 
   init_theme();
+  if (!isset($theme)) {
+    $theme = $theme_key;
+  }
 
-  $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $theme_key);
+  $result = db_query("SELECT * FROM {blocks} WHERE theme = '%s'", $theme);
   $old_blocks = array();
   while ($old_block = db_fetch_array($result)) {
     $old_blocks[$old_block['module']][$old_block['delta']] = $old_block;
@@ -240,7 +246,7 @@
 
   $blocks = array();
   // Valid region names for the theme.
-  $regions = system_region_list($theme_key);
+  $regions = system_region_list($theme);
 
   foreach (module_list() as $module) {
     $module_blocks = module_invoke($module, 'block', 'list');
@@ -250,7 +256,7 @@
           // If it's a new block, add identifiers.
           $block['module'] = $module;
           $block['delta']  = $delta;
-          $block['theme']  = $theme_key;
+          $block['theme']  = $theme;
           if (!isset($block['pages'])) {
             // {block}.pages is type 'text', so it cannot have a
             // default value, and not null, so we need to provide
@@ -266,9 +272,13 @@
         }
         else {
           // If it's an existing block, database settings should overwrite
-          // the code. But aside from 'info' everything that's definable in
-          // code is stored in the database and we do not store 'info', so we
-          // do not need to update the database here.
+          // the code. The only exceptions are 'cache' which is only definable
+          // and updatable in the code, and 'info' which is not stored in
+          // the database.
+          // Update the cache mode only; the other values don't need to change.
+          if (isset($block['cache']) && $block['cache'] != $old_blocks[$module][$delta]['cache']) {
+            db_query("UPDATE {blocks} SET cache = %d WHERE bid = %d", $block['cache'], $old_blocks[$module][$delta]['bid']);
+          }
           // Add 'info' to this block.
           $old_blocks[$module][$delta]['info'] = $block['info'];
           // If the region name does not exist, disable the block and assign it to none.
@@ -292,13 +302,26 @@
   // Remove blocks that are no longer defined by the code from the database.
   foreach ($old_blocks as $module => $old_module_blocks) {
     foreach ($old_module_blocks as $delta => $block) {
-      db_query("DELETE FROM {blocks} WHERE module = '%s' AND delta = '%s' AND theme = '%s'", $module, $delta, $theme_key);
+      db_query("DELETE FROM {blocks} WHERE module = '%s' AND delta = '%s' AND theme = '%s'", $module, $delta, $theme);
     }
   }
   return $blocks;
 }
 
 /**
+ * Implementation of hook_flush_caches().
+ */
+function block_flush_caches() {
+  // Rehash blocks for active themes. We don't use list_themes() here,
+  // because if MAINTENANCE_MODE is defined it skips reading the database,
+  // and we can't tell which themes are active.
+  $result = db_query("SELECT name FROM {system} WHERE type = 'theme' AND status = 1");
+  while ($theme = db_result($result)) {
+    _block_rehash($theme);
+  }
+}
+
+/**
  * Returns information from database about a user-created (custom) block.
  *
  * @param $bid

=== modified file 'modules/blog/blog.info'
--- modules/blog/blog.info	2010-12-16 19:28:18 +0000
+++ modules/blog/blog.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: blog.info,v 1.5 2007/06/08 05:50:53 dries Exp $
 name = Blog
 description = Enables keeping easily and regularly updated user web pages or blogs.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/blog/blog.module'
--- modules/blog/blog.module	2009-02-25 22:33:09 +0000
+++ modules/blog/blog.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: blog.module,v 1.297.2.4 2009/02/25 12:21:53 goba Exp $
 
 /**
  * @file

=== modified file 'modules/blog/blog.pages.inc'
--- modules/blog/blog.pages.inc	2009-09-16 20:14:32 +0000
+++ modules/blog/blog.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: blog.pages.inc,v 1.6.2.3 2009/09/14 15:08:00 goba Exp $
 
 /**
  * @file

=== modified file 'modules/blogapi/blogapi.info'
--- modules/blogapi/blogapi.info	2010-12-16 19:28:18 +0000
+++ modules/blogapi/blogapi.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: blogapi.info,v 1.4 2007/06/08 05:50:53 dries Exp $
 name = Blog API
 description = Allows users to post content using applications that support XML-RPC blog APIs.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/blogapi/blogapi.install'
--- modules/blogapi/blogapi.install	2009-01-15 00:30:06 +0000
+++ modules/blogapi/blogapi.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: blogapi.install,v 1.1.2.2 2009/01/06 15:46:36 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/blogapi/blogapi.module'
--- modules/blogapi/blogapi.module	2008-12-06 09:02:33 +0000
+++ modules/blogapi/blogapi.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: blogapi.module,v 1.115.2.5 2008/10/08 20:12:17 goba Exp $
 
 /**
  * @file

=== modified file 'modules/book/book-all-books-block.tpl.php'
--- modules/book/book-all-books-block.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/book/book-all-books-block.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: book-all-books-block.tpl.php,v 1.1 2007/11/04 14:29:09 goba Exp $
 
 /**
  * @file book-all-books-block.tpl.php

=== modified file 'modules/book/book-export-html.tpl.php'
--- modules/book/book-export-html.tpl.php	2009-05-13 20:47:41 +0000
+++ modules/book/book-export-html.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: book-export-html.tpl.php,v 1.1.2.1 2009/05/13 19:11:04 goba Exp $
 
 /**
  * @file book-export-html.tpl.php

=== modified file 'modules/book/book-navigation.tpl.php'
--- modules/book/book-navigation.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/book/book-navigation.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: book-navigation.tpl.php,v 1.1 2007/11/04 14:29:09 goba Exp $
 
 /**
  * @file book-navigation.tpl.php

=== modified file 'modules/book/book-node-export-html.tpl.php'
--- modules/book/book-node-export-html.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/book/book-node-export-html.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: book-node-export-html.tpl.php,v 1.1 2007/11/04 14:29:09 goba Exp $
 
 /**
  * @file book-node-export-html.tpl.php

=== modified file 'modules/book/book-rtl.css'
--- modules/book/book-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/book/book-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: book-rtl.css,v 1.1 2007/05/27 17:57:48 goba Exp $ */
 
 .book-navigation .page-previous {
   float: right;

=== modified file 'modules/book/book.admin.inc'
--- modules/book/book.admin.inc	2008-12-06 09:02:33 +0000
+++ modules/book/book.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: book.admin.inc,v 1.8.2.3 2008/10/22 19:26:01 goba Exp $
 
 /**
  * @file

=== modified file 'modules/book/book.css'
--- modules/book/book.css	2008-12-06 09:02:33 +0000
+++ modules/book/book.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: book.css,v 1.6 2007/11/26 16:19:37 dries Exp $ */
 
 .book-navigation .menu {
   border-top: 1px solid #888;

=== modified file 'modules/book/book.info'
--- modules/book/book.info	2010-12-16 19:28:18 +0000
+++ modules/book/book.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: book.info,v 1.5 2007/07/30 18:20:21 dries Exp $
 name = Book
 description = Allows users to structure site pages in a hierarchy or outline.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/book/book.install'
--- modules/book/book.install	2009-01-15 00:30:06 +0000
+++ modules/book/book.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: book.install,v 1.20.2.1 2009/01/06 15:46:36 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/book/book.module'
--- modules/book/book.module	2009-02-25 22:33:09 +0000
+++ modules/book/book.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: book.module,v 1.454.2.6 2009/02/25 11:47:37 goba Exp $
 
 /**
  * @file

=== modified file 'modules/book/book.pages.inc'
--- modules/book/book.pages.inc	2010-08-11 20:54:17 +0000
+++ modules/book/book.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: book.pages.inc,v 1.5.2.2 2010/08/06 11:00:49 goba Exp $
 
 /**
  * @file
@@ -78,8 +77,11 @@
     if (isset($node->book)) {
       $tree = book_menu_subtree_data($node->book);
       $contents = book_export_traverse($tree, 'book_node_export');
-    }
-    return theme('book_export_html', $node->title, $contents, $node->book['depth']);
+      return theme('book_export_html', $node->title, $contents, $node->book['depth']);
+    }
+    else {
+      drupal_not_found();
+    }
   }
   else {
     drupal_access_denied();

=== modified file 'modules/color/color-rtl.css'
--- modules/color/color-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/color/color-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: color-rtl.css,v 1.2 2007/11/27 12:09:25 goba Exp $ */
 
 #placeholder {
   left: 0;

=== modified file 'modules/color/color.css'
--- modules/color/color.css	2008-12-06 09:02:33 +0000
+++ modules/color/color.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: color.css,v 1.4 2007/05/27 17:57:48 goba Exp $ */
 
 /* Farbtastic placement */
 .color-form {

=== modified file 'modules/color/color.info'
--- modules/color/color.info	2010-12-16 19:28:18 +0000
+++ modules/color/color.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: color.info,v 1.3 2007/06/08 05:50:54 dries Exp $
 name = Color
 description = Allows the user to change the color scheme of certain themes.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/color/color.install'
--- modules/color/color.install	2008-12-06 09:02:33 +0000
+++ modules/color/color.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-/* $Id: color.install,v 1.2 2006/12/05 05:49:50 dries Exp $ */
 
 function color_requirements($phase) {
   $requirements = array();
@@ -33,3 +32,20 @@
 
   return $requirements;
 }
+
+/**
+ * Warn site administrator if unsafe CSS color codes are found in the database.
+ */
+function color_update_6001() {
+  $ret = array();
+  $result = db_query("SELECT name FROM {variable} WHERE name LIKE 'color_%_palette'");
+  while ($variable = db_fetch_array($result)) {
+    $palette = variable_get($variable['name'], array());
+    foreach ($palette as $key => $color) {
+      if (!preg_match('/^#([a-f0-9]{3}){1,2}$/iD', $color)) {
+        drupal_set_message('Some of the custom CSS color codes specified via the color module are invalid. Please examine the themes which are making use of the color module at the <a href="'. url('admin/appearance/settings') .'">Appearance settings</a> page to verify their CSS color values.', 'warning');
+      }
+    }
+  }
+  return $ret;
+}

=== modified file 'modules/color/color.js'
--- modules/color/color.js	2008-12-06 09:02:33 +0000
+++ modules/color/color.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: color.js,v 1.6 2007/09/12 18:29:32 goba Exp $
 
 Drupal.behaviors.color = function (context) {
   // This behavior attaches by ID, so is only valid once on a page.

=== modified file 'modules/color/color.module'
--- modules/color/color.module	2009-07-01 22:33:52 +0000
+++ modules/color/color.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: color.module,v 1.39.2.2 2009/05/16 16:09:21 dries Exp $
 
 /**
  * Implementation of hook_help().
@@ -46,6 +45,7 @@
         '#theme' => 'color_scheme_form',
       );
       $form['color'] += color_scheme_form($form_state, arg(4));
+      $form['#validate'][] = 'color_scheme_form_validate';
       $form['#submit'][] = 'color_scheme_form_submit';
     }
   }
@@ -237,6 +237,18 @@
 }
 
 /**
+ * Validation handler for color change form.
+ */
+function color_scheme_form_validate($form, &$form_state) {
+  // Only accept hexadecimal CSS color strings to avoid XSS upon use.
+  foreach ($form_state['values']['palette'] as $key => $color) {
+    if (!preg_match('/^#([a-f0-9]{3}){1,2}$/iD', $color)) {
+      form_set_error('palette][' . $key, t('%name must be a valid hexadecimal CSS color value.', array('%name' => $form['color']['palette'][$key]['#title'])));
+    }
+  }
+}
+
+/**
  * Submit handler for color change form.
  */
 function color_scheme_form_submit($form, &$form_state) {

=== modified file 'modules/comment/comment-folded.tpl.php'
--- modules/comment/comment-folded.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/comment/comment-folded.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment-folded.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file comment-folded.tpl.php

=== modified file 'modules/comment/comment-rtl.css'
--- modules/comment/comment-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/comment/comment-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: comment-rtl.css,v 1.2 2007/11/27 12:09:25 goba Exp $ */
 
 .indented {
   margin-left: 0;

=== modified file 'modules/comment/comment-wrapper.tpl.php'
--- modules/comment/comment-wrapper.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/comment/comment-wrapper.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment-wrapper.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file comment-wrapper.tpl.php

=== modified file 'modules/comment/comment.admin.inc'
--- modules/comment/comment.admin.inc	2010-03-04 01:32:05 +0000
+++ modules/comment/comment.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment.admin.inc,v 1.4.2.3 2010/01/28 10:15:11 goba Exp $
 
 /**
  * @file

=== modified file 'modules/comment/comment.css'
--- modules/comment/comment.css	2008-12-06 09:02:33 +0000
+++ modules/comment/comment.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: comment.css,v 1.4 2007/07/24 21:33:53 goba Exp $ */
 
 .indented {
   margin-left: 25px; /* LTR */

=== modified file 'modules/comment/comment.info'
--- modules/comment/comment.info	2010-12-16 19:28:18 +0000
+++ modules/comment/comment.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: comment.info,v 1.4 2007/06/08 05:50:54 dries Exp $
 name = Comment
 description = Allows users to comment on and discuss published content.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/comment/comment.install'
--- modules/comment/comment.install	2009-01-15 00:30:06 +0000
+++ modules/comment/comment.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment.install,v 1.19.2.1 2009/01/06 15:46:36 goba Exp $
 
 /**
  * Implementation of hook_enable().

=== modified file 'modules/comment/comment.js'
--- modules/comment/comment.js	2008-12-06 09:02:33 +0000
+++ modules/comment/comment.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: comment.js,v 1.5 2007/09/12 18:29:32 goba Exp $
 
 Drupal.behaviors.comment = function (context) {
   var parts = new Array("name", "homepage", "mail");

=== modified file 'modules/comment/comment.module'
--- modules/comment/comment.module	2010-10-24 02:12:39 +0000
+++ modules/comment/comment.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment.module,v 1.617.2.17 2010/08/11 20:35:47 goba Exp $
 
 /**
  * @file

=== modified file 'modules/comment/comment.pages.inc'
--- modules/comment/comment.pages.inc	2009-07-01 22:33:52 +0000
+++ modules/comment/comment.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment.pages.inc,v 1.2.2.2 2009/07/01 20:51:55 goba Exp $
 
 /**
  * @file

=== modified file 'modules/comment/comment.tpl.php'
--- modules/comment/comment.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/comment/comment.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment.tpl.php,v 1.4.2.1 2008/03/21 21:58:28 goba Exp $
 
 /**
  * @file comment.tpl.php

=== modified file 'modules/contact/contact.admin.inc'
--- modules/contact/contact.admin.inc	2009-12-16 21:46:50 +0000
+++ modules/contact/contact.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: contact.admin.inc,v 1.3.2.1 2009/12/16 20:47:10 goba Exp $
 
 /**
  * @file

=== modified file 'modules/contact/contact.info'
--- modules/contact/contact.info	2010-12-16 19:28:18 +0000
+++ modules/contact/contact.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: contact.info,v 1.4 2007/06/08 05:50:54 dries Exp $
 name = Contact
 description = Enables the use of both personal and site-wide contact forms.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/contact/contact.install'
--- modules/contact/contact.install	2009-01-15 00:30:06 +0000
+++ modules/contact/contact.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: contact.install,v 1.10.2.1 2009/01/06 15:46:36 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/contact/contact.module'
--- modules/contact/contact.module	2010-01-30 05:35:07 +0000
+++ modules/contact/contact.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: contact.module,v 1.103.2.2 2009/11/06 07:36:34 goba Exp $
 
 /**
  * @file

=== modified file 'modules/contact/contact.pages.inc'
--- modules/contact/contact.pages.inc	2009-04-30 00:36:53 +0000
+++ modules/contact/contact.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: contact.pages.inc,v 1.6.2.2 2009/04/27 14:48:21 goba Exp $
 
 /**
  * @file

=== modified file 'modules/dblog/dblog-rtl.css'
--- modules/dblog/dblog-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/dblog/dblog-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: dblog-rtl.css,v 1.2.2.1 2008/09/02 16:56:49 dries Exp $ */
 
 #edit-type-wrapper, #edit-severity-wrapper {
   float: right;

=== modified file 'modules/dblog/dblog.admin.inc'
--- modules/dblog/dblog.admin.inc	2010-12-16 19:39:23 +0000
+++ modules/dblog/dblog.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: dblog.admin.inc,v 1.6.2.2 2010/12/09 11:58:30 goba Exp $
 
 /**
  * @file

=== modified file 'modules/dblog/dblog.css'
--- modules/dblog/dblog.css	2008-12-06 09:02:33 +0000
+++ modules/dblog/dblog.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: dblog.css,v 1.4.2.1 2008/09/02 16:56:49 dries Exp $ */
 
 #edit-type-wrapper, #edit-severity-wrapper {
   float: left; /* LTR */

=== modified file 'modules/dblog/dblog.info'
--- modules/dblog/dblog.info	2010-12-16 19:28:18 +0000
+++ modules/dblog/dblog.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: dblog.info,v 1.2 2007/06/08 05:50:54 dries Exp $
 name = Database logging
 description = Logs and records system events to the database.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/dblog/dblog.install'
--- modules/dblog/dblog.install	2009-09-16 19:57:16 +0000
+++ modules/dblog/dblog.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: dblog.install,v 1.6.2.3 2009/09/14 08:19:24 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/dblog/dblog.module'
--- modules/dblog/dblog.module	2010-03-04 01:32:05 +0000
+++ modules/dblog/dblog.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: dblog.module,v 1.21.2.3 2010/03/01 10:26:48 goba Exp $
 
 /**
  * @file

=== modified file 'modules/filter/filter.admin.inc'
--- modules/filter/filter.admin.inc	2008-12-06 09:02:33 +0000
+++ modules/filter/filter.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: filter.admin.inc,v 1.8.2.1 2008/02/12 14:25:34 goba Exp $
 
 /**
  * @file

=== modified file 'modules/filter/filter.info'
--- modules/filter/filter.info	2010-12-16 19:28:18 +0000
+++ modules/filter/filter.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: filter.info,v 1.4 2007/06/08 05:50:54 dries Exp $
 name = Filter
 description = Handles the filtering of content in preparation for display.
 package = Core - required
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/filter/filter.install'
--- modules/filter/filter.install	2009-01-15 00:30:06 +0000
+++ modules/filter/filter.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: filter.install,v 1.5.2.1 2009/01/06 15:46:36 goba Exp $
 
 /**
  * Implementation of hook_schema().

=== modified file 'modules/filter/filter.module'
--- modules/filter/filter.module	2010-12-16 19:39:23 +0000
+++ modules/filter/filter.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: filter.module,v 1.204.2.17 2010/11/03 14:11:43 goba Exp $
 
 /**
  * @file
@@ -397,10 +396,9 @@
 }
 
 /**
- * @name Filtering functions
+ * @defgroup filtering_functions Filtering functions
  * @{
- * Modules which need to have content filtered can use these functions to
- * interact with the filter system.
+ * Functions for interacting with the content filtering system.
  *
  * For more info, see the hook_filter() documentation.
  *
@@ -604,19 +602,20 @@
 }
 
 /**
- * @name Standard filters
+ * @defgroup standard_filters Standard filters
  * @{
  * Filters implemented by the filter.module.
  */
 
 /**
- * Implementation of hook_filter(). Contains a basic set of essential filters.
- * - HTML filter:
- *     Validates user-supplied HTML, transforming it as necessary.
- * - Line break converter:
- *     Converts newlines into paragraph and break tags.
- * - URL and e-mail address filter:
- *     Converts newlines into paragraph and break tags.
+ * Implementation of hook_filter().
+ *
+ * Sets up a basic set of essential filters.
+ * - HTML filter: Restricts user-supplied HTML to certain tags, and removes
+ *   dangerous components in allowed tags.
+ * - Line break converter: Converts newlines into paragraph and break tags.
+ * - URL filter: Converts URLs and e-mail addresses into links.
+ * - HTML corrector: Fixes faulty HTML.
  */
 function filter_filter($op, $delta = 0, $format = -1, $text = '') {
   switch ($op) {

=== modified file 'modules/filter/filter.pages.inc'
--- modules/filter/filter.pages.inc	2008-12-06 09:02:33 +0000
+++ modules/filter/filter.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: filter.pages.inc,v 1.2 2007/11/10 17:41:18 dries Exp $
 
 /**
  * @file

=== modified file 'modules/forum/forum-icon.tpl.php'
--- modules/forum/forum-icon.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/forum/forum-icon.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forum-icon.tpl.php,v 1.3 2007/12/20 09:35:09 goba Exp $
 
 /**
  * @file forum-icon.tpl.php

=== modified file 'modules/forum/forum-list.tpl.php'
--- modules/forum/forum-list.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/forum/forum-list.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forum-list.tpl.php,v 1.4 2007/08/30 18:58:12 goba Exp $
 
 /**
  * @file forum-list.tpl.php

=== modified file 'modules/forum/forum-rtl.css'
--- modules/forum/forum-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/forum/forum-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: forum-rtl.css,v 1.3 2007/11/27 12:09:26 goba Exp $ */
 
 #forum tr td.forum {
   padding-left: 0.5em;

=== modified file 'modules/forum/forum-submitted.tpl.php'
--- modules/forum/forum-submitted.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/forum/forum-submitted.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forum-submitted.tpl.php,v 1.3 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file forum-submitted.tpl.php

=== modified file 'modules/forum/forum-topic-list.tpl.php'
--- modules/forum/forum-topic-list.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/forum/forum-topic-list.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forum-topic-list.tpl.php,v 1.4.2.1 2008/10/22 18:22:51 dries Exp $
 
 /**
  * @file forum-topic-list.tpl.php

=== modified file 'modules/forum/forum-topic-navigation.tpl.php'
--- modules/forum/forum-topic-navigation.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/forum/forum-topic-navigation.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forum-topic-navigation.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file forum-topic-navigation.tpl.php

=== modified file 'modules/forum/forum.admin.inc'
--- modules/forum/forum.admin.inc	2009-07-01 22:33:52 +0000
+++ modules/forum/forum.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forum.admin.inc,v 1.8.2.1 2009/05/26 08:13:00 goba Exp $
 
 /**
  * @file

=== modified file 'modules/forum/forum.css'
--- modules/forum/forum.css	2008-12-06 09:02:33 +0000
+++ modules/forum/forum.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: forum.css,v 1.5 2007/07/22 07:01:07 dries Exp $ */
 
 #forum .description {
   font-size: 0.9em;

=== modified file 'modules/forum/forum.info'
--- modules/forum/forum.info	2010-12-16 19:28:18 +0000
+++ modules/forum/forum.info	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-; $Id: forum.info,v 1.6 2007/06/08 05:50:54 dries Exp $
 name = Forum
 description = Enables threaded discussions about general topics.
 dependencies[] = taxonomy
@@ -7,8 +6,8 @@
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/forum/forum.install'
--- modules/forum/forum.install	2009-01-15 00:30:06 +0000
+++ modules/forum/forum.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forum.install,v 1.16.2.2 2009/01/06 15:46:37 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/forum/forum.module'
--- modules/forum/forum.module	2010-12-16 19:28:18 +0000
+++ modules/forum/forum.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forum.module,v 1.448.2.9 2010/12/15 12:37:01 goba Exp $
 
 /**
  * @file
@@ -495,11 +494,31 @@
   $_forums = taxonomy_get_tree($vid, $tid);
 
   if (count($_forums)) {
-
-    $counts = array();
-
-    $sql = "SELECT r.tid, COUNT(n.nid) AS topic_count, SUM(l.comment_count) AS comment_count FROM {node} n INNER JOIN {node_comment_statistics} l ON n.nid = l.nid INNER JOIN {term_node} r ON n.vid = r.vid WHERE n.status = 1 GROUP BY r.tid";
-    $sql = db_rewrite_sql($sql);
+  $counts = array();
+    $sql = "
+      SELECT r.tid AS tid, n.nid AS nid, l.comment_count AS nid_comment_count
+        FROM {node} n
+        INNER JOIN {node_comment_statistics} l ON n.nid = l.nid
+        INNER JOIN {term_node} r ON n.vid = r.vid
+        WHERE n.status = 1
+        GROUP BY r.tid, n.nid, l.comment_count";
+    $sql_rewritten = db_rewrite_sql($sql);
+    if ($sql_rewritten == $sql) {
+      $sql = "
+        SELECT r.tid, COUNT(n.nid) AS topic_count, SUM(l.comment_count) AS comment_count
+          FROM {node} n
+          INNER JOIN {node_comment_statistics} l ON n.nid = l.nid
+          INNER JOIN {term_node} r ON n.vid = r.vid
+          WHERE n.status = 1
+          GROUP BY r.tid";
+      $sql = db_rewrite_sql($sql);
+    }
+    else {
+      $sql = "
+        SELECT tid, COUNT(nid) AS topic_count, SUM(nid_comment_count) AS comment_count
+          FROM ($sql_rewritten) AS forum_content_list
+          GROUP BY tid";
+    }
     $_counts = db_query($sql);
     while ($count = db_fetch_object($_counts)) {
       $counts[$count->tid] = $count;
@@ -546,7 +565,7 @@
  * than NODE_NEW_LIMIT.
  */
 function _forum_topics_unread($term, $uid) {
-  $sql = "SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.vid = tn.vid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.created > %d AND h.nid IS NULL";
+  $sql = "SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} tn ON n.vid = tn.vid AND tn.tid = %d LEFT JOIN {history} h ON n.nid = h.nid AND h.uid = %d WHERE n.status = 1 AND n.created > %d AND h.nid IS NULL";
   $sql = db_rewrite_sql($sql);
   return db_result(db_query($sql, $term, $uid, NODE_NEW_LIMIT));
 }
@@ -575,7 +594,7 @@
   $sql .= tablesort_sql($forum_topic_list_header, 'n.sticky DESC,');
   $sql .= ', n.created DESC';  // Always add a secondary sort order so that the news forum topics are on top.
 
-  $sql_count = db_rewrite_sql("SELECT COUNT(n.nid) FROM {node} n INNER JOIN {term_node} r ON n.vid = r.vid AND r.tid = %d WHERE n.status = 1");
+  $sql_count = db_rewrite_sql("SELECT COUNT(DISTINCT n.nid) FROM {node} n INNER JOIN {term_node} r ON n.vid = r.vid AND r.tid = %d WHERE n.status = 1");
 
   $result = pager_query($sql, $forum_per_page, 0, $sql_count, $tid);
   $topics = array();

=== modified file 'modules/forum/forum.pages.inc'
--- modules/forum/forum.pages.inc	2009-07-01 22:33:52 +0000
+++ modules/forum/forum.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forum.pages.inc,v 1.2.2.1 2009/07/01 20:51:55 goba Exp $
 
 /**
  * @file

=== modified file 'modules/forum/forums.tpl.php'
--- modules/forum/forums.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/forum/forums.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: forums.tpl.php,v 1.4 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file forums.tpl.php

=== modified file 'modules/help/help-rtl.css'
--- modules/help/help-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/help/help-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: help-rtl.css,v 1.2 2007/11/27 12:09:26 goba Exp $ */
 
 .help-items {
   float: right;

=== modified file 'modules/help/help.admin.inc'
--- modules/help/help.admin.inc	2008-12-06 09:02:33 +0000
+++ modules/help/help.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: help.admin.inc,v 1.5 2007/11/25 11:11:17 goba Exp $
 
 /**
  * @file

=== modified file 'modules/help/help.css'
--- modules/help/help.css	2008-12-06 09:02:33 +0000
+++ modules/help/help.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: help.css,v 1.2 2007/05/27 17:57:48 goba Exp $ */
 
 .help-items {
   float: left; /* LTR */

=== modified file 'modules/help/help.info'
--- modules/help/help.info	2010-12-16 19:28:18 +0000
+++ modules/help/help.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: help.info,v 1.4 2007/06/08 05:50:54 dries Exp $
 name = Help
 description = Manages the display of online help.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/help/help.module'
--- modules/help/help.module	2008-12-06 09:02:33 +0000
+++ modules/help/help.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: help.module,v 1.78.2.1 2008/04/09 21:11:48 goba Exp $
 
 /**
  * @file

=== modified file 'modules/locale/locale.css'
--- modules/locale/locale.css	2008-12-06 09:02:33 +0000
+++ modules/locale/locale.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: locale.css,v 1.1 2006/08/14 07:14:49 drumm Exp $ */
 
 .locale-untranslated {
   font-style: normal;

=== modified file 'modules/locale/locale.info'
--- modules/locale/locale.info	2010-12-16 19:28:18 +0000
+++ modules/locale/locale.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: locale.info,v 1.6 2007/11/05 08:43:48 goba Exp $
 name = Locale
 description = Adds language handling functionality and enables the translation of the user interface to languages other than English.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/locale/locale.install'
--- modules/locale/locale.install	2010-03-04 01:32:05 +0000
+++ modules/locale/locale.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: locale.install,v 1.27.2.3 2010/03/04 00:15:28 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/locale/locale.module'
--- modules/locale/locale.module	2010-12-16 19:39:23 +0000
+++ modules/locale/locale.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: locale.module,v 1.212.2.11 2010/12/06 06:50:56 goba Exp $
 
 /**
  * @file

=== modified file 'modules/menu/menu.admin.inc'
--- modules/menu/menu.admin.inc	2010-06-02 20:30:18 +0000
+++ modules/menu/menu.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: menu.admin.inc,v 1.26.2.7 2010/06/02 12:56:20 goba Exp $
 
 /**
  * @file
@@ -410,7 +409,7 @@
     $form['menu_name'] = array(
       '#type' => 'textfield',
       '#title' => t('Menu name'),
-      '#maxsize' => MENU_MAX_MENU_NAME_LENGTH_UI,
+      '#maxlength' => MENU_MAX_MENU_NAME_LENGTH_UI,
       '#description' => t('The machine-readable name of this menu. This text will be used for constructing the URL of the <em>menu overview</em> page for this menu. This name must contain only lowercase letters, numbers, and hyphens, and must be unique.'),
       '#required' => TRUE,
     );
@@ -510,9 +509,6 @@
   if (preg_match('/[^a-z0-9-]/', $item['menu_name'])) {
     form_set_error('menu_name', t('The menu name may only consist of lowercase letters, numbers, and hyphens.'));
   }
-  if (strlen($item['menu_name']) > MENU_MAX_MENU_NAME_LENGTH_UI) {
-    form_set_error('menu_name', format_plural(MENU_MAX_MENU_NAME_LENGTH_UI, "The menu name can't be longer than 1 character.", "The menu name can't be longer than @count characters."));
-  }
   if ($form['#insert']) {
     // We will add 'menu-' to the menu name to help avoid name-space conflicts.
     $item['menu_name'] = 'menu-'. $item['menu_name'];

=== modified file 'modules/menu/menu.info'
--- modules/menu/menu.info	2010-12-16 19:28:18 +0000
+++ modules/menu/menu.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: menu.info,v 1.4 2007/06/08 05:50:55 dries Exp $
 name = Menu
 description = Allows administrators to customize the site navigation menu.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/menu/menu.install'
--- modules/menu/menu.install	2009-01-15 00:30:06 +0000
+++ modules/menu/menu.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: menu.install,v 1.9.2.1 2009/01/06 15:46:37 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/menu/menu.module'
--- modules/menu/menu.module	2009-04-30 00:36:53 +0000
+++ modules/menu/menu.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: menu.module,v 1.157.2.6 2009/04/27 12:50:13 goba Exp $
 
 /**
  * @file
@@ -46,7 +45,7 @@
 function menu_menu() {
   $items['admin/build/menu'] = array(
     'title' => 'Menus',
-    'description' => "Control your site's navigation menu, primary links and secondary links. as well as rename and reorganize menu items.",
+    'description' => "Control your site's navigation menu, primary links and secondary links, as well as rename and reorganize menu items.",
     'page callback' => 'menu_overview_page',
     'access callback' => 'user_access',
     'access arguments' => array('administer menu'),

=== modified file 'modules/node/content_types.inc'
--- modules/node/content_types.inc	2009-09-16 19:57:16 +0000
+++ modules/node/content_types.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: content_types.inc,v 1.50.2.3 2009/09/14 11:51:23 goba Exp $
 
 /**
  * @file

=== modified file 'modules/node/node-rtl.css'
--- modules/node/node-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/node/node-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: node-rtl.css,v 1.3 2007/11/27 12:09:26 goba Exp $ */
 
 #node-admin-buttons {
   float: right;

=== modified file 'modules/node/node.admin.inc'
--- modules/node/node.admin.inc	2009-07-01 22:43:26 +0000
+++ modules/node/node.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: node.admin.inc,v 1.19.2.3 2009/06/08 16:45:34 goba Exp $
 
 /**
  * @file

=== modified file 'modules/node/node.css'
--- modules/node/node.css	2008-12-06 09:02:33 +0000
+++ modules/node/node.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: node.css,v 1.5 2008/01/25 21:21:44 goba Exp $ */
 
 .node-unpublished {
   background-color: #fff4f4;

=== modified file 'modules/node/node.info'
--- modules/node/node.info	2010-12-16 19:28:18 +0000
+++ modules/node/node.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: node.info,v 1.4 2007/06/08 05:50:55 dries Exp $
 name = Node
 description = Allows content to be submitted to the site and displayed on pages.
 package = Core - required
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/node/node.install'
--- modules/node/node.install	2011-02-02 21:19:00 +0000
+++ modules/node/node.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: node.install,v 1.4.2.3 2009/01/06 15:46:37 goba Exp $
 
 /**
  * Implementation of hook_schema().

=== modified file 'modules/node/node.module'
--- modules/node/node.module	2011-07-29 12:38:56 +0000
+++ modules/node/node.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: node.module,v 1.947.2.29 2010/12/15 12:53:33 goba Exp $
 
 /**
  * @file
@@ -1012,6 +1011,7 @@
   if (node_access('delete', $node)) {
     db_query('DELETE FROM {node} WHERE nid = %d', $node->nid);
     db_query('DELETE FROM {node_revisions} WHERE nid = %d', $node->nid);
+    db_query('DELETE FROM {node_access} WHERE nid = %d', $node->nid);
 
     // Call the node-specific callback (if any):
     node_invoke($node, 'delete');

=== modified file 'modules/node/node.pages.inc'
--- modules/node/node.pages.inc	2009-04-30 00:36:53 +0000
+++ modules/node/node.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: node.pages.inc,v 1.28.2.4 2009/04/27 11:35:01 goba Exp $
 
 /**
  * @file

=== modified file 'modules/node/node.tpl.php'
--- modules/node/node.tpl.php	2009-09-16 19:57:16 +0000
+++ modules/node/node.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: node.tpl.php,v 1.4.2.1 2009/08/10 10:48:33 goba Exp $
 
 /**
  * @file node.tpl.php

=== modified file 'modules/openid/openid.css'
--- modules/openid/openid.css	2009-04-30 00:36:53 +0000
+++ modules/openid/openid.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: openid.css,v 1.5.2.1 2009/03/31 10:48:22 dries Exp $ */
 
 #edit-openid-identifier {
   background-image: url("login-bg.png");

=== modified file 'modules/openid/openid.inc'
--- modules/openid/openid.inc	2010-03-04 01:32:05 +0000
+++ modules/openid/openid.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: openid.inc,v 1.8.2.3 2010/03/01 11:06:41 goba Exp $
 
 /**
  * @file

=== modified file 'modules/openid/openid.info'
--- modules/openid/openid.info	2010-12-16 19:28:18 +0000
+++ modules/openid/openid.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: openid.info,v 1.2 2007/06/22 22:26:43 unconed Exp $
 name = OpenID
 description = "Allows users to log into your site using OpenID."
 version = VERSION
 package = Core - optional
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/openid/openid.install'
--- modules/openid/openid.install	2010-08-11 20:54:17 +0000
+++ modules/openid/openid.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: openid.install,v 1.3.2.2 2010/08/11 20:35:48 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/openid/openid.js'
--- modules/openid/openid.js	2008-12-06 09:02:33 +0000
+++ modules/openid/openid.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: openid.js,v 1.6 2008/01/30 22:11:22 goba Exp $
 
 Drupal.behaviors.openid = function (context) {
   var $loginElements = $("#edit-name-wrapper, #edit-pass-wrapper, li.openid-link");

=== modified file 'modules/openid/openid.module'
--- modules/openid/openid.module	2010-10-24 02:12:39 +0000
+++ modules/openid/openid.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: openid.module,v 1.19.2.11 2010/08/11 20:35:48 goba Exp $
 
 /**
  * @file

=== modified file 'modules/openid/openid.pages.inc'
--- modules/openid/openid.pages.inc	2009-09-16 19:57:16 +0000
+++ modules/openid/openid.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: openid.pages.inc,v 1.5.2.2 2009/09/16 19:34:14 goba Exp $
 
 /**
  * @file

=== modified file 'modules/openid/xrds.inc'
--- modules/openid/xrds.inc	2008-12-06 09:02:33 +0000
+++ modules/openid/xrds.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: xrds.inc,v 1.2 2007/10/15 09:40:42 goba Exp $
 
 // Global variables to track parsing state
 $xrds_open_elements = array();

=== modified file 'modules/path/path.admin.inc'
--- modules/path/path.admin.inc	2008-12-11 04:56:37 +0000
+++ modules/path/path.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: path.admin.inc,v 1.7.2.1 2008/11/22 10:49:15 dries Exp $
 
 /**
  * @file

=== modified file 'modules/path/path.info'
--- modules/path/path.info	2010-12-16 19:28:18 +0000
+++ modules/path/path.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: path.info,v 1.4 2007/06/08 05:50:55 dries Exp $
 name = Path
 description = Allows users to rename URLs.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/path/path.module'
--- modules/path/path.module	2008-12-11 04:56:37 +0000
+++ modules/path/path.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: path.module,v 1.138.2.3 2008/11/22 10:49:15 dries Exp $
 
 /**
  * @file

=== modified file 'modules/php/php.info'
--- modules/php/php.info	2010-12-16 19:28:18 +0000
+++ modules/php/php.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: php.info,v 1.2 2007/06/08 05:50:55 dries Exp $
 name = PHP filter
 description = Allows embedded PHP code/snippets to be evaluated.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/php/php.install'
--- modules/php/php.install	2008-12-06 09:02:33 +0000
+++ modules/php/php.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: php.install,v 1.1 2007/04/24 10:54:34 dries Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/php/php.module'
--- modules/php/php.module	2008-12-06 09:02:33 +0000
+++ modules/php/php.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: php.module,v 1.8.2.1 2008/02/05 09:29:50 goba Exp $
 
 /**
  * @file

=== modified file 'modules/ping/ping.info'
--- modules/ping/ping.info	2010-12-16 19:28:18 +0000
+++ modules/ping/ping.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: ping.info,v 1.4 2007/06/08 05:50:55 dries Exp $
 name = Ping
 description = Alerts other sites when your site has been updated.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/ping/ping.module'
--- modules/ping/ping.module	2009-12-16 21:46:50 +0000
+++ modules/ping/ping.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: ping.module,v 1.52.2.1 2009/11/06 07:46:22 goba Exp $
 
 /**
  * @file

=== modified file 'modules/poll/poll-bar-block.tpl.php'
--- modules/poll/poll-bar-block.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/poll/poll-bar-block.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: poll-bar-block.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file poll-bar-block.tpl.php

=== modified file 'modules/poll/poll-bar.tpl.php'
--- modules/poll/poll-bar.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/poll/poll-bar.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: poll-bar.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file poll-bar.tpl.php

=== modified file 'modules/poll/poll-results-block.tpl.php'
--- modules/poll/poll-results-block.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/poll/poll-results-block.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: poll-results-block.tpl.php,v 1.2 2007/08/02 20:08:53 dries Exp $
 /**
  * @file poll-results-block.tpl.php
  * Display the poll results in a block.

=== modified file 'modules/poll/poll-results.tpl.php'
--- modules/poll/poll-results.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/poll/poll-results.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: poll-results.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file poll-results-block.tpl.php

=== modified file 'modules/poll/poll-rtl.css'
--- modules/poll/poll-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/poll/poll-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: poll-rtl.css,v 1.2 2007/05/30 18:28:13 goba Exp $ */
 
 .poll .bar .foreground {
   float: right;

=== modified file 'modules/poll/poll-vote.tpl.php'
--- modules/poll/poll-vote.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/poll/poll-vote.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: poll-vote.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file poll-vote.tpl.php

=== modified file 'modules/poll/poll.css'
--- modules/poll/poll.css	2008-12-06 09:02:33 +0000
+++ modules/poll/poll.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: poll.css,v 1.6 2008/01/22 07:47:57 goba Exp $ */
 
 .poll .bar {
   height: 1em;

=== modified file 'modules/poll/poll.info'
--- modules/poll/poll.info	2010-12-16 19:28:18 +0000
+++ modules/poll/poll.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: poll.info,v 1.4 2007/06/08 05:50:55 dries Exp $
 name = Poll
 description = Allows your site to capture votes on different topics in the form of multiple choice questions.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/poll/poll.install'
--- modules/poll/poll.install	2009-01-15 00:30:06 +0000
+++ modules/poll/poll.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: poll.install,v 1.13.2.1 2009/01/06 15:46:37 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/poll/poll.module'
--- modules/poll/poll.module	2010-10-24 02:12:39 +0000
+++ modules/poll/poll.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: poll.module,v 1.263.2.5 2010/05/11 12:40:43 goba Exp $
 
 /**
  * @file

=== modified file 'modules/poll/poll.pages.inc'
--- modules/poll/poll.pages.inc	2008-12-06 09:02:33 +0000
+++ modules/poll/poll.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: poll.pages.inc,v 1.4 2007/12/14 09:50:41 goba Exp $
 
 /**
  * @file

=== modified file 'modules/profile/profile-block.tpl.php'
--- modules/profile/profile-block.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/profile/profile-block.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: profile-block.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file profile-block.tpl.php

=== modified file 'modules/profile/profile-listing.tpl.php'
--- modules/profile/profile-listing.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/profile/profile-listing.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: profile-listing.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file profile-listing.tpl.php

=== modified file 'modules/profile/profile-wrapper.tpl.php'
--- modules/profile/profile-wrapper.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/profile/profile-wrapper.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: profile-wrapper.tpl.php,v 1.2 2007/08/07 08:39:35 goba Exp $
 
 /**
  * @file profile-wrapper.tpl.php

=== modified file 'modules/profile/profile.admin.inc'
--- modules/profile/profile.admin.inc	2010-03-04 01:53:34 +0000
+++ modules/profile/profile.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: profile.admin.inc,v 1.8.2.2 2010/03/01 10:20:28 goba Exp $
 
 /**
  * @file

=== modified file 'modules/profile/profile.css'
--- modules/profile/profile.css	2008-12-06 09:02:33 +0000
+++ modules/profile/profile.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: profile.css,v 1.3 2007/11/30 09:02:51 goba Exp $ */
 
 #profile-fields td.category {
   font-weight: bold;

=== modified file 'modules/profile/profile.info'
--- modules/profile/profile.info	2010-12-16 19:28:18 +0000
+++ modules/profile/profile.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: profile.info,v 1.4 2007/06/08 05:50:55 dries Exp $
 name = Profile
 description = Supports configurable user profiles.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/profile/profile.install'
--- modules/profile/profile.install	2009-01-15 00:30:06 +0000
+++ modules/profile/profile.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: profile.install,v 1.12.2.1 2009/01/06 15:46:37 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/profile/profile.js'
--- modules/profile/profile.js	2008-12-06 09:02:33 +0000
+++ modules/profile/profile.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: profile.js,v 1.2 2007/12/08 14:06:22 goba Exp $
 
 /**
  * Add functionality to the profile drag and drop table.

=== modified file 'modules/profile/profile.module'
--- modules/profile/profile.module	2009-01-15 00:33:03 +0000
+++ modules/profile/profile.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: profile.module,v 1.236.2.3 2009/01/12 10:09:19 goba Exp $
 
 /**
  * @file

=== modified file 'modules/profile/profile.pages.inc'
--- modules/profile/profile.pages.inc	2008-12-06 10:55:54 +0000
+++ modules/profile/profile.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: profile.pages.inc,v 1.2 2007/12/08 14:06:22 goba Exp $
 
 /**
  * @file

=== modified file 'modules/search/search-block-form.tpl.php'
--- modules/search/search-block-form.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/search/search-block-form.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: search-block-form.tpl.php,v 1.1 2007/10/31 18:06:38 dries Exp $
 
 /**
  * @file search-block-form.tpl.php

=== modified file 'modules/search/search-result.tpl.php'
--- modules/search/search-result.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/search/search-result.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: search-result.tpl.php,v 1.1.2.1 2008/08/28 08:21:44 dries Exp $
 
 /**
  * @file search-result.tpl.php

=== modified file 'modules/search/search-results.tpl.php'
--- modules/search/search-results.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/search/search-results.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: search-results.tpl.php,v 1.1 2007/10/31 18:06:38 dries Exp $
 
 /**
  * @file search-results.tpl.php

=== modified file 'modules/search/search-rtl.css'
--- modules/search/search-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/search/search-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: search-rtl.css,v 1.3 2007/11/27 12:09:26 goba Exp $ */
 
 .search-advanced .criterion {
   float: right;

=== modified file 'modules/search/search-theme-form.tpl.php'
--- modules/search/search-theme-form.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/search/search-theme-form.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: search-theme-form.tpl.php,v 1.1 2007/10/31 18:06:38 dries Exp $
 
 /**
  * @file search-theme-form.tpl.php

=== modified file 'modules/search/search.admin.inc'
--- modules/search/search.admin.inc	2008-12-06 09:02:33 +0000
+++ modules/search/search.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: search.admin.inc,v 1.4 2008/01/08 10:35:42 goba Exp $
 
 /**
  * @file

=== modified file 'modules/search/search.css'
--- modules/search/search.css	2008-12-06 09:02:33 +0000
+++ modules/search/search.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: search.css,v 1.3 2007/10/31 18:06:38 dries Exp $ */
 
 .search-form {
   margin-bottom: 1em;

=== modified file 'modules/search/search.info'
--- modules/search/search.info	2010-12-16 19:28:18 +0000
+++ modules/search/search.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: search.info,v 1.4 2007/06/08 05:50:55 dries Exp $
 name = Search
 description = Enables site-wide keyword searching.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/search/search.install'
--- modules/search/search.install	2009-01-15 00:30:06 +0000
+++ modules/search/search.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: search.install,v 1.14.2.1 2009/01/06 15:46:37 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/search/search.module'
--- modules/search/search.module	2010-12-16 19:28:18 +0000
+++ modules/search/search.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: search.module,v 1.250.2.13 2010/12/13 18:45:16 goba Exp $
 
 /**
  * @file

=== modified file 'modules/search/search.pages.inc'
--- modules/search/search.pages.inc	2008-12-06 09:02:33 +0000
+++ modules/search/search.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: search.pages.inc,v 1.4 2007/12/06 09:51:01 goba Exp $
 
 /**
  * @file

=== modified file 'modules/statistics/statistics.admin.inc'
--- modules/statistics/statistics.admin.inc	2010-06-14 21:58:50 +0000
+++ modules/statistics/statistics.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: statistics.admin.inc,v 1.6.2.2 2010/06/02 12:14:48 goba Exp $
 
 /**
  * @file

=== modified file 'modules/statistics/statistics.info'
--- modules/statistics/statistics.info	2010-12-16 19:28:18 +0000
+++ modules/statistics/statistics.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: statistics.info,v 1.4 2007/06/08 05:50:56 dries Exp $
 name = Statistics
 description = Logs access statistics for your site.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/statistics/statistics.install'
--- modules/statistics/statistics.install	2009-09-16 19:57:16 +0000
+++ modules/statistics/statistics.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: statistics.install,v 1.13.2.3 2009/09/14 08:19:24 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/statistics/statistics.module'
--- modules/statistics/statistics.module	2010-06-02 20:30:18 +0000
+++ modules/statistics/statistics.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: statistics.module,v 1.272.2.2 2010/06/02 12:14:48 goba Exp $
 
 /**
  * @file

=== modified file 'modules/statistics/statistics.pages.inc'
--- modules/statistics/statistics.pages.inc	2009-04-30 00:36:53 +0000
+++ modules/statistics/statistics.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: statistics.pages.inc,v 1.2.2.1 2009/04/27 12:08:29 goba Exp $
 
 /**
  * @file

=== modified file 'modules/syslog/syslog.info'
--- modules/syslog/syslog.info	2010-12-16 19:28:18 +0000
+++ modules/syslog/syslog.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: syslog.info,v 1.2 2007/06/08 05:50:56 dries Exp $
 name = Syslog
 description = Logs and records system events to syslog.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/syslog/syslog.install'
--- modules/syslog/syslog.install	2010-12-16 19:28:18 +0000
+++ modules/syslog/syslog.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: syslog.install,v 1.1.2.2 2010/09/06 11:08:44 goba Exp $
 
 /**
  * @file

=== modified file 'modules/syslog/syslog.module'
--- modules/syslog/syslog.module	2010-12-16 19:28:18 +0000
+++ modules/syslog/syslog.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: syslog.module,v 1.14.2.3 2010/09/06 11:08:44 goba Exp $
 
 /**
  * @file

=== modified file 'modules/system/admin-rtl.css'
--- modules/system/admin-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/system/admin-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: admin-rtl.css,v 1.5 2007/12/22 23:24:25 goba Exp $ */
 
 div.admin-panel .body {
   padding: 0 8px 2px 4px;

=== modified file 'modules/system/admin.css'
--- modules/system/admin.css	2008-12-06 09:02:33 +0000
+++ modules/system/admin.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: admin.css,v 1.18.2.1 2008/04/25 21:01:54 goba Exp $ */
 
 /*
 ** Formatting for administration page

=== modified file 'modules/system/block.tpl.php'
--- modules/system/block.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/system/block.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: block.tpl.php,v 1.4 2007/09/01 05:42:48 dries Exp $
 
 /**
  * @file block.tpl.php

=== modified file 'modules/system/box.tpl.php'
--- modules/system/box.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/system/box.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: box.tpl.php,v 1.3 2007/12/16 21:01:45 goba Exp $
 
 /**
  * @file box.tpl.php

=== modified file 'modules/system/defaults-rtl.css'
--- modules/system/defaults-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/system/defaults-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: defaults-rtl.css,v 1.3 2007/11/27 12:09:26 goba Exp $ */
 
 th {
   text-align: right;

=== modified file 'modules/system/defaults.css'
--- modules/system/defaults.css	2008-12-06 09:02:33 +0000
+++ modules/system/defaults.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: defaults.css,v 1.5 2007/10/02 12:10:40 dries Exp $ */
 
 /*
 ** HTML elements

=== modified file 'modules/system/maintenance-page.tpl.php'
--- modules/system/maintenance-page.tpl.php	2009-04-30 00:36:53 +0000
+++ modules/system/maintenance-page.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: maintenance-page.tpl.php,v 1.2.2.1 2009/04/30 00:13:31 goba Exp $
 
 /**
  * @file maintenance-page.tpl.php

=== modified file 'modules/system/maintenance.css'
--- modules/system/maintenance.css	2008-12-06 09:02:33 +0000
+++ modules/system/maintenance.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: maintenance.css,v 1.1 2007/11/30 12:19:10 goba Exp $ */
 
 /* Update styles */
 #update-results {

=== modified file 'modules/system/page.tpl.php'
--- modules/system/page.tpl.php	2010-08-11 20:54:17 +0000
+++ modules/system/page.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: page.tpl.php,v 1.11.2.2 2010/08/06 11:13:42 goba Exp $
 
 /**
  * @file

=== modified file 'modules/system/system-menus-rtl.css'
--- modules/system/system-menus-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/system/system-menus-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: system-menus-rtl.css,v 1.1 2007/10/05 14:50:25 goba Exp $ */
 
 ul.menu {
   text-align:right;

=== modified file 'modules/system/system-menus.css'
--- modules/system/system-menus.css	2008-12-06 09:02:33 +0000
+++ modules/system/system-menus.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: system-menus.css,v 1.1 2007/10/05 14:50:25 goba Exp $ */
 
 ul.menu {
   list-style: none;

=== modified file 'modules/system/system-rtl.css'
--- modules/system/system-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/system/system-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: system-rtl.css,v 1.12 2008/01/10 18:08:19 goba Exp $ */
 
 thead th {
   text-align: right;

=== modified file 'modules/system/system.admin.inc'
--- modules/system/system.admin.inc	2010-12-16 19:39:23 +0000
+++ modules/system/system.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: system.admin.inc,v 1.63.2.16 2010/09/06 10:49:14 goba Exp $
 
 /**
  * @file
@@ -62,6 +61,7 @@
 
 /**
  * Provide a single block from the administration menu as a page.
+ *
  * This function is often a destination for these blocks.
  * For example, 'admin/content/types' needs to have a destination to be valid
  * in the Drupal menu system, but too much information there might be

=== modified file 'modules/system/system.css'
--- modules/system/system.css	2010-12-16 19:28:18 +0000
+++ modules/system/system.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: system.css,v 1.48.2.1 2010/11/14 14:16:29 goba Exp $ */
 
 /*
 ** HTML elements

=== modified file 'modules/system/system.info'
--- modules/system/system.info	2010-12-16 19:28:18 +0000
+++ modules/system/system.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: system.info,v 1.4 2007/06/08 05:50:56 dries Exp $
 name = System
 description = Handles general site configuration for administrators.
 package = Core - required
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/system/system.install'
--- modules/system/system.install	2011-02-02 21:19:00 +0000
+++ modules/system/system.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: system.install,v 1.238.2.25 2010/11/03 12:29:24 goba Exp $
 
 /**
  * Test and report Drupal installation requirements.

=== modified file 'modules/system/system.js'
--- modules/system/system.js	2009-09-16 19:57:16 +0000
+++ modules/system/system.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: system.js,v 1.14.2.2 2009/07/21 08:59:12 goba Exp $
 
 /**
  * Internal function to check using Ajax if clean URLs can be enabled on the

=== modified file 'modules/system/system.module'
--- modules/system/system.module	2011-02-02 21:19:00 +0000
+++ modules/system/system.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: system.module,v 1.585.2.59 2010/12/15 21:11:23 goba Exp $
 
 /**
  * @file
@@ -9,7 +8,7 @@
 /**
  * The current system version.
  */
-define('VERSION', '6.20');
+define('VERSION', '6.22');
 
 /**
  * Core API compatibility.
@@ -920,7 +919,13 @@
     $themes_info = $themes;
   }
 
-  return $themes_info;
+  // To avoid side effects, we don't return the original objects.
+  $themes_info_cloned = array();
+  foreach ($themes_info as $key => $theme) {
+    $themes_info_cloned[$key] = drupal_clone($theme);
+  }
+
+  return $themes_info_cloned;
 }
 
 /**

=== modified file 'modules/taxonomy/taxonomy.admin.inc'
--- modules/taxonomy/taxonomy.admin.inc	2010-06-02 20:30:18 +0000
+++ modules/taxonomy/taxonomy.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: taxonomy.admin.inc,v 1.22.2.4 2010/05/28 16:16:45 goba Exp $
 
 /**
  * @file

=== modified file 'modules/taxonomy/taxonomy.css'
--- modules/taxonomy/taxonomy.css	2008-12-06 09:02:33 +0000
+++ modules/taxonomy/taxonomy.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: taxonomy.css,v 1.5 2008/01/25 21:20:26 goba Exp $ */
 
 tr.taxonomy-term-preview {
   background-color: #EEE;

=== modified file 'modules/taxonomy/taxonomy.info'
--- modules/taxonomy/taxonomy.info	2010-12-16 19:28:18 +0000
+++ modules/taxonomy/taxonomy.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: taxonomy.info,v 1.4 2007/06/08 05:50:56 dries Exp $
 name = Taxonomy
 description = Enables the categorization of content.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/taxonomy/taxonomy.install'
--- modules/taxonomy/taxonomy.install	2009-01-15 00:30:06 +0000
+++ modules/taxonomy/taxonomy.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: taxonomy.install,v 1.7.2.1 2009/01/06 15:46:38 goba Exp $
 
 /**
  * Implementation of hook_schema().

=== modified file 'modules/taxonomy/taxonomy.js'
--- modules/taxonomy/taxonomy.js	2008-12-06 09:02:33 +0000
+++ modules/taxonomy/taxonomy.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: taxonomy.js,v 1.2 2007/12/16 10:36:53 goba Exp $
 
 /**
  * Move a block in the blocks table from one region to another via select list.

=== modified file 'modules/taxonomy/taxonomy.module'
--- modules/taxonomy/taxonomy.module	2010-08-11 21:05:18 +0000
+++ modules/taxonomy/taxonomy.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: taxonomy.module,v 1.414.2.16 2010/08/06 11:10:57 goba Exp $
 
 /**
  * @file

=== modified file 'modules/taxonomy/taxonomy.pages.inc'
--- modules/taxonomy/taxonomy.pages.inc	2009-04-30 00:38:51 +0000
+++ modules/taxonomy/taxonomy.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: taxonomy.pages.inc,v 1.9.2.1 2009/04/27 11:49:05 goba Exp $
 
 /**
  * @file

=== modified file 'modules/throttle/throttle.admin.inc'
--- modules/throttle/throttle.admin.inc	2008-12-06 09:02:33 +0000
+++ modules/throttle/throttle.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: throttle.admin.inc,v 1.2 2008/01/08 10:35:43 goba Exp $
 
 /**
  * @file

=== modified file 'modules/throttle/throttle.info'
--- modules/throttle/throttle.info	2010-12-16 19:28:18 +0000
+++ modules/throttle/throttle.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: throttle.info,v 1.4 2007/06/08 05:50:57 dries Exp $
 name = Throttle
 description = Handles the auto-throttling mechanism, to control site congestion.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/throttle/throttle.module'
--- modules/throttle/throttle.module	2008-12-06 09:02:33 +0000
+++ modules/throttle/throttle.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: throttle.module,v 1.83 2007/12/14 18:08:49 goba Exp $
 
 /**
  * @file

=== modified file 'modules/tracker/tracker.css'
--- modules/tracker/tracker.css	2008-12-06 09:02:33 +0000
+++ modules/tracker/tracker.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: tracker.css,v 1.1 2006/08/14 07:14:50 drumm Exp $ */
 
 #tracker td.replies {
   text-align: center;

=== modified file 'modules/tracker/tracker.info'
--- modules/tracker/tracker.info	2010-12-16 19:28:18 +0000
+++ modules/tracker/tracker.info	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-; $Id: tracker.info,v 1.5 2007/07/04 10:54:26 goba Exp $
 name = Tracker
 description = Enables tracking of recent posts for users.
 dependencies[] = comment
@@ -6,8 +5,8 @@
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/tracker/tracker.module'
--- modules/tracker/tracker.module	2008-12-06 09:02:33 +0000
+++ modules/tracker/tracker.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: tracker.module,v 1.154.2.1 2008/04/09 21:11:51 goba Exp $
 
 /**
  * @file

=== modified file 'modules/tracker/tracker.pages.inc'
--- modules/tracker/tracker.pages.inc	2008-12-06 09:02:33 +0000
+++ modules/tracker/tracker.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: tracker.pages.inc,v 1.5 2007/11/28 10:29:20 dries Exp $
 
 /**
  * @file

=== modified file 'modules/translation/translation.info'
--- modules/translation/translation.info	2010-12-16 19:28:18 +0000
+++ modules/translation/translation.info	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-; $Id: translation.info,v 1.1 2007/06/15 18:40:14 goba Exp $
 name = Content translation
 description = Allows content to be translated into different languages.
 dependencies[] = locale
@@ -6,8 +5,8 @@
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/translation/translation.module'
--- modules/translation/translation.module	2010-12-16 19:28:18 +0000
+++ modules/translation/translation.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: translation.module,v 1.23.2.6 2010/12/15 12:27:56 goba Exp $
 
 /**
  * @file

=== modified file 'modules/translation/translation.pages.inc'
--- modules/translation/translation.pages.inc	2008-12-06 09:02:33 +0000
+++ modules/translation/translation.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: translation.pages.inc,v 1.2.2.1 2008/09/30 10:50:43 goba Exp $
 
 /**
  * @file

=== modified file 'modules/trigger/trigger.admin.inc'
--- modules/trigger/trigger.admin.inc	2010-08-11 20:54:17 +0000
+++ modules/trigger/trigger.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: trigger.admin.inc,v 1.5.2.1 2010/08/11 20:35:48 goba Exp $
 
 /**
  * @file

=== modified file 'modules/trigger/trigger.info'
--- modules/trigger/trigger.info	2010-12-16 19:28:18 +0000
+++ modules/trigger/trigger.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: trigger.info,v 1.1 2007/09/11 14:50:05 goba Exp $
 name = Trigger
 description = Enables actions to be fired on certain system events, such as when new content is created.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/trigger/trigger.install'
--- modules/trigger/trigger.install	2009-01-15 00:30:06 +0000
+++ modules/trigger/trigger.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: trigger.install,v 1.5.2.1 2009/01/06 15:46:38 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/trigger/trigger.module'
--- modules/trigger/trigger.module	2010-08-11 20:54:17 +0000
+++ modules/trigger/trigger.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: trigger.module,v 1.13.2.4 2010/06/30 09:38:50 goba Exp $
 
 /**
  * @file

=== modified file 'modules/update/update-rtl.css'
--- modules/update/update-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/update/update-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: update-rtl.css,v 1.3 2007/11/27 16:22:22 goba Exp $ */
 
 .update .project {
   padding-right: .25em;

=== modified file 'modules/update/update.compare.inc'
--- modules/update/update.compare.inc	2010-06-02 20:30:18 +0000
+++ modules/update/update.compare.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: update.compare.inc,v 1.8.2.9 2010/03/05 09:10:49 goba Exp $
 
 /**
  * @file

=== modified file 'modules/update/update.css'
--- modules/update/update.css	2009-04-30 00:36:53 +0000
+++ modules/update/update.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: update.css,v 1.3.2.2 2009/04/29 17:17:20 goba Exp $ */
 
 .update .project {
   font-weight: bold;

=== modified file 'modules/update/update.fetch.inc'
--- modules/update/update.fetch.inc	2009-09-16 19:57:16 +0000
+++ modules/update/update.fetch.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: update.fetch.inc,v 1.7.2.7 2009/07/21 08:59:12 goba Exp $
 
 /**
  * @file

=== modified file 'modules/update/update.info'
--- modules/update/update.info	2010-12-16 19:28:18 +0000
+++ modules/update/update.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: update.info,v 1.1 2007/07/11 15:15:40 dries Exp $
 name = Update status
 description = Checks the status of available updates for Drupal and your installed modules and themes.
 version = VERSION
 package = Core - optional
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/update/update.install'
--- modules/update/update.install	2010-06-02 20:30:18 +0000
+++ modules/update/update.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: update.install,v 1.4.2.3 2010/05/19 15:03:58 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/update/update.module'
--- modules/update/update.module	2010-01-30 05:35:07 +0000
+++ modules/update/update.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: update.module,v 1.17.2.6 2009/12/16 17:30:00 goba Exp $
 
 /**
  * @file

=== modified file 'modules/update/update.report.inc'
--- modules/update/update.report.inc	2009-12-16 21:46:50 +0000
+++ modules/update/update.report.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: update.report.inc,v 1.10.2.6 2009/11/06 07:26:21 goba Exp $
 
 /**
  * @file

=== modified file 'modules/update/update.settings.inc'
--- modules/update/update.settings.inc	2009-04-30 00:36:53 +0000
+++ modules/update/update.settings.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: update.settings.inc,v 1.3.2.1 2009/04/29 17:17:21 goba Exp $
 
 /**
  * @file

=== modified file 'modules/upload/upload.admin.inc'
--- modules/upload/upload.admin.inc	2008-12-06 09:02:33 +0000
+++ modules/upload/upload.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: upload.admin.inc,v 1.7 2008/01/10 20:22:57 goba Exp $
 
 /**
  * Form API callback to validate the upload settings form.

=== modified file 'modules/upload/upload.info'
--- modules/upload/upload.info	2010-12-16 19:28:18 +0000
+++ modules/upload/upload.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: upload.info,v 1.4 2007/06/08 05:50:57 dries Exp $
 name = Upload
 description = Allows users to upload and attach files to content.
 package = Core - optional
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/upload/upload.install'
--- modules/upload/upload.install	2009-01-15 00:30:06 +0000
+++ modules/upload/upload.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: upload.install,v 1.6.2.2 2009/01/06 15:46:38 goba Exp $
 
 /**
  * Implementation of hook_install().

=== modified file 'modules/upload/upload.module'
--- modules/upload/upload.module	2010-12-16 19:28:18 +0000
+++ modules/upload/upload.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: upload.module,v 1.197.2.8 2010/12/13 18:40:49 goba Exp $
 
 /**
  * @file

=== modified file 'modules/user/user-picture.tpl.php'
--- modules/user/user-picture.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/user/user-picture.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: user-picture.tpl.php,v 1.2 2007/08/07 08:39:36 goba Exp $
 
 /**
  * @file user-picture.tpl.php

=== modified file 'modules/user/user-profile-category.tpl.php'
--- modules/user/user-profile-category.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/user/user-profile-category.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: user-profile-category.tpl.php,v 1.2 2007/08/07 08:39:36 goba Exp $
 
 /**
  * @file user-profile-category.tpl.php

=== modified file 'modules/user/user-profile-item.tpl.php'
--- modules/user/user-profile-item.tpl.php	2008-12-06 09:02:33 +0000
+++ modules/user/user-profile-item.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: user-profile-item.tpl.php,v 1.2 2007/08/07 08:39:36 goba Exp $
 
 /**
  * @file user-profile-item.tpl.php

=== modified file 'modules/user/user-profile.tpl.php'
--- modules/user/user-profile.tpl.php	2009-12-16 21:46:50 +0000
+++ modules/user/user-profile.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: user-profile.tpl.php,v 1.2.2.2 2009/10/06 11:50:06 goba Exp $
 
 /**
  * @file user-profile.tpl.php

=== modified file 'modules/user/user-rtl.css'
--- modules/user/user-rtl.css	2008-12-06 09:02:33 +0000
+++ modules/user/user-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: user-rtl.css,v 1.3 2007/11/27 12:09:26 goba Exp $ */
 
 #permissions td.permission {
   padding-left: 0;

=== modified file 'modules/user/user.admin.inc'
--- modules/user/user.admin.inc	2010-03-04 01:53:34 +0000
+++ modules/user/user.admin.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: user.admin.inc,v 1.18.2.2 2010/03/01 11:15:38 goba Exp $
 
 /**
  * @file

=== modified file 'modules/user/user.css'
--- modules/user/user.css	2008-12-06 09:02:33 +0000
+++ modules/user/user.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: user.css,v 1.7 2007/06/21 04:38:41 unconed Exp $ */
 
 #permissions td.module {
   font-weight: bold;

=== modified file 'modules/user/user.info'
--- modules/user/user.info	2010-12-16 19:28:18 +0000
+++ modules/user/user.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: user.info,v 1.4 2007/06/08 05:50:57 dries Exp $
 name = User
 description = Manages the user registration and login system.
 package = Core - required
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'modules/user/user.install'
--- modules/user/user.install	2011-02-02 21:19:00 +0000
+++ modules/user/user.install	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: user.install,v 1.5.2.2 2009/07/01 20:51:56 goba Exp $
 
 /**
  * Implementation of hook_schema().

=== modified file 'modules/user/user.js'
--- modules/user/user.js	2008-12-06 09:02:33 +0000
+++ modules/user/user.js	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $Id: user.js,v 1.6 2007/09/12 18:29:32 goba Exp $
 
 /**
  * Attach handlers to evaluate the strength of any password fields and to check

=== modified file 'modules/user/user.module'
--- modules/user/user.module	2011-07-29 12:38:56 +0000
+++ modules/user/user.module	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: user.module,v 1.892.2.28 2010/11/04 09:16:45 goba Exp $
 
 /**
  * @file
@@ -815,17 +814,7 @@
           // Perform database queries to gather online user lists.  We use s.timestamp
           // rather than u.access because it is much faster.
           $anonymous_count = sess_count($interval);
-          $authenticated_users = db_query('SELECT DISTINCT u.uid, u.name, s.timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= %d AND s.uid > 0 ORDER BY s.timestamp DESC', $interval);
-          $authenticated_count = 0;
-          $max_users = variable_get('user_block_max_list_count', 10);
-          $items = array();
-          while ($account = db_fetch_object($authenticated_users)) {
-            if ($max_users > 0) {
-              $items[] = $account;
-              $max_users--;
-            }
-            $authenticated_count++;
-          }
+          $authenticated_count = db_result(db_query('SELECT COUNT(DISTINCT s.uid) FROM {sessions} s WHERE s.timestamp >= %d AND s.uid > 0', $interval));
 
           // Format the output with proper grammar.
           if ($anonymous_count == 1 && $authenticated_count == 1) {
@@ -838,6 +827,10 @@
           // Display a list of currently online users.
           $max_users = variable_get('user_block_max_list_count', 10);
           if ($authenticated_count && $max_users) {
+            $authenticated_users = db_query_range('SELECT u.uid, u.name, MAX(s.timestamp) AS timestamp FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= %d AND s.uid > 0 GROUP BY u.uid, u.name ORDER BY s.timestamp DESC', $interval, 0, $max_users);
+            while ($account = db_fetch_object($authenticated_users)) {
+              $items[] = $account;
+            }
             $output .= theme('user_list', $items, t('Online users'));
           }
 

=== modified file 'modules/user/user.pages.inc'
--- modules/user/user.pages.inc	2010-10-24 02:12:39 +0000
+++ modules/user/user.pages.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: user.pages.inc,v 1.11.2.3 2010/06/02 12:03:07 goba Exp $
 
 /**
  * @file

=== modified file 'profiles/default/default.profile'
--- profiles/default/default.profile	2008-12-29 03:08:46 +0000
+++ profiles/default/default.profile	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: default.profile,v 1.22 2007/12/17 12:43:34 goba Exp $
 
 /**
  * Return an array of the modules to be enabled when this profile is installed.

=== modified file 'robots.txt'
--- robots.txt	2010-12-16 19:28:18 +0000
+++ robots.txt	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-# $Id: robots.txt,v 1.9.2.2 2010/09/06 10:37:16 goba Exp $
 #
 # robots.txt
 #
@@ -41,7 +40,6 @@
 # Paths (clean URLs)
 Disallow: /admin/
 Disallow: /comment/reply/
-Disallow: /contact/
 Disallow: /logout/
 Disallow: /node/add/
 Disallow: /search/
@@ -51,7 +49,6 @@
 # Paths (no clean URLs)
 Disallow: /?q=admin/
 Disallow: /?q=comment/reply/
-Disallow: /?q=contact/
 Disallow: /?q=logout/
 Disallow: /?q=node/add/
 Disallow: /?q=search/

=== modified file 'scripts/code-clean.sh'
--- scripts/code-clean.sh	2008-12-06 09:02:33 +0000
+++ scripts/code-clean.sh	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: code-clean.sh,v 1.8 2005/08/11 13:02:08 dries Exp $
 
 find . -name "*~" -type f | xargs rm -f
 find . -name ".#*" -type f | xargs rm -f

=== modified file 'scripts/code-style.pl'
--- scripts/code-style.pl	2008-12-06 09:02:33 +0000
+++ scripts/code-style.pl	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 #!/usr/bin/perl -w
-# $Id: code-style.pl,v 1.14 2007/02/15 11:40:19 dries Exp $
 
 use Pod::Usage;
 use Getopt::Long qw(GetOptions);

=== modified file 'scripts/cron-curl.sh'
--- scripts/cron-curl.sh	2008-12-06 09:02:33 +0000
+++ scripts/cron-curl.sh	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
 #!/bin/sh
-# $Id: cron-curl.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
 
 curl --silent --compressed http://example.com/cron.php

=== modified file 'scripts/cron-lynx.sh'
--- scripts/cron-lynx.sh	2008-12-06 09:02:33 +0000
+++ scripts/cron-lynx.sh	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
 #!/bin/sh
-# $Id: cron-lynx.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
 
 /usr/bin/lynx -source http://example.com/cron.php > /dev/null 2>&1

=== modified file 'scripts/drupal.sh'
--- scripts/drupal.sh	2009-09-20 21:01:42 +0000
+++ scripts/drupal.sh	2011-07-29 12:42:31 +0000
@@ -1,6 +1,5 @@
 #!/usr/bin/php
 <?php
-// $Id: drupal.sh,v 1.4 2007/07/02 14:41:37 dries Exp $
 
 /**
  * Drupal shell execution script

=== modified file 'sites/all/README.txt'
--- sites/all/README.txt	2008-12-06 09:02:33 +0000
+++ sites/all/README.txt	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-// $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

=== modified file 'sites/default/default.settings.php'
--- sites/default/default.settings.php	2010-12-16 19:39:23 +0000
+++ sites/default/default.settings.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: default.settings.php,v 1.8.2.5 2010/12/15 13:21:14 goba Exp $
 
 /**
  * @file

=== modified file 'themes/bluemarine/block.tpl.php'
--- themes/bluemarine/block.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/bluemarine/block.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: block.tpl.php,v 1.3 2007/08/07 08:39:36 goba Exp $
 ?>
   <div class="block block-<?php print $block->module; ?>" id="block-<?php print $block->module; ?>-<?php print $block->delta; ?>">
     <h2 class="title"><?php print $block->subject; ?></h2>

=== modified file 'themes/bluemarine/bluemarine.info'
--- themes/bluemarine/bluemarine.info	2010-12-16 19:28:18 +0000
+++ themes/bluemarine/bluemarine.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: bluemarine.info,v 1.4 2007/06/08 05:50:57 dries Exp $
 name = Bluemarine
 description = Table-based multi-column theme with a marine and ash color scheme.
 version = VERSION
 core = 6.x
 engine = phptemplate
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'themes/bluemarine/box.tpl.php'
--- themes/bluemarine/box.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/bluemarine/box.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: box.tpl.php,v 1.3 2007/08/07 08:39:36 goba Exp $
 ?>
   <div class="box">
     <?php if ($title) { ?><h2 class="title"><?php print $title; ?></h2><?php } ?>

=== modified file 'themes/bluemarine/comment.tpl.php'
--- themes/bluemarine/comment.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/bluemarine/comment.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment.tpl.php,v 1.7 2008/01/04 19:24:23 goba Exp $
 ?>
   <div class="comment<?php print ' '. $status; ?>">
     <?php if ($picture) {

=== modified file 'themes/bluemarine/logo.png' (properties changed: +x to -x)
=== modified file 'themes/bluemarine/node.tpl.php'
--- themes/bluemarine/node.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/bluemarine/node.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: node.tpl.php,v 1.7 2007/08/07 08:39:36 goba Exp $
 ?>
   <div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?>">
     <?php if ($picture) {

=== modified file 'themes/bluemarine/page.tpl.php'
--- themes/bluemarine/page.tpl.php	2009-04-30 00:36:53 +0000
+++ themes/bluemarine/page.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: page.tpl.php,v 1.28.2.1 2009/04/30 00:13:31 goba Exp $
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language ?>" xml:lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
 

=== modified file 'themes/bluemarine/style-rtl.css'
--- themes/bluemarine/style-rtl.css	2008-12-06 09:02:33 +0000
+++ themes/bluemarine/style-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style-rtl.css,v 1.5 2007/12/17 15:05:09 goba Exp $ */
 body {
   direction: rtl;
 }

=== modified file 'themes/bluemarine/style.css'
--- themes/bluemarine/style.css	2008-12-06 09:02:33 +0000
+++ themes/bluemarine/style.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style.css,v 1.23 2007/12/17 15:05:09 goba Exp $ */
 
 /*
 ** HTML elements

=== modified file 'themes/chameleon/chameleon.info'
--- themes/chameleon/chameleon.info	2010-12-16 19:28:18 +0000
+++ themes/chameleon/chameleon.info	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-; $Id: chameleon.info,v 1.4 2007/07/01 23:27:31 goba Exp $
 name = Chameleon
 description = Minimalist tabled theme with light colors.
 regions[left] = Left sidebar
@@ -12,8 +11,8 @@
 version = VERSION
 core = 6.x
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'themes/chameleon/chameleon.theme'
--- themes/chameleon/chameleon.theme	2009-04-30 00:38:51 +0000
+++ themes/chameleon/chameleon.theme	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: chameleon.theme,v 1.76.2.1 2009/04/30 00:13:31 goba Exp $
 
 /**
  * @file

=== modified file 'themes/chameleon/common-rtl.css'
--- themes/chameleon/common-rtl.css	2008-12-06 09:02:33 +0000
+++ themes/chameleon/common-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: common-rtl.css,v 1.2 2007/06/05 09:15:02 dries Exp $ */
 
 body {
   direction: rtl;

=== modified file 'themes/chameleon/common.css'
--- themes/chameleon/common.css	2008-12-06 09:02:33 +0000
+++ themes/chameleon/common.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: common.css,v 1.12 2007/06/04 11:10:38 goba Exp $ */
 
 /*
 ** HTML elements

=== modified file 'themes/chameleon/logo.png' (properties changed: +x to -x)
=== modified file 'themes/chameleon/marvin/logo.png' (properties changed: +x to -x)
=== modified file 'themes/chameleon/marvin/marvin.info'
--- themes/chameleon/marvin/marvin.info	2010-12-16 19:28:18 +0000
+++ themes/chameleon/marvin/marvin.info	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-; $Id: marvin.info,v 1.4 2007/06/08 05:50:57 dries Exp $
 name = Marvin
 description = Boxy tabled theme in all grays.
 regions[left] = Left sidebar
@@ -7,8 +6,8 @@
 core = 6.x
 base theme = chameleon
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'themes/chameleon/marvin/style-rtl.css'
--- themes/chameleon/marvin/style-rtl.css	2008-12-06 09:02:33 +0000
+++ themes/chameleon/marvin/style-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style-rtl.css,v 1.2 2007/11/27 12:09:27 goba Exp $ */
 
 body {
   background-image: url(druplicon-watermark-rtl.png);

=== modified file 'themes/chameleon/marvin/style.css'
--- themes/chameleon/marvin/style.css	2008-12-06 09:02:33 +0000
+++ themes/chameleon/marvin/style.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style.css,v 1.8 2007/06/04 11:10:38 goba Exp $ */
 
 /*
 ** HTML elements

=== modified file 'themes/chameleon/style-rtl.css'
--- themes/chameleon/style-rtl.css	2008-12-06 09:02:33 +0000
+++ themes/chameleon/style-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style-rtl.css,v 1.3 2007/11/27 12:09:27 goba Exp $ */
 
 body {
   padding: 5em 3em 0 0;

=== modified file 'themes/chameleon/style.css'
--- themes/chameleon/style.css	2008-12-06 09:02:33 +0000
+++ themes/chameleon/style.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style.css,v 1.7 2007/06/04 11:10:38 goba Exp $ */
 
 /*
 ** HTML elements

=== modified file 'themes/engines/phptemplate/phptemplate.engine'
--- themes/engines/phptemplate/phptemplate.engine	2010-06-02 20:30:18 +0000
+++ themes/engines/phptemplate/phptemplate.engine	2011-07-29 12:42:31 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: phptemplate.engine,v 1.69.2.1 2010/05/11 09:48:03 goba Exp $
+// $Id$
 
 /**
  * @file

=== modified file 'themes/garland/block.tpl.php'
--- themes/garland/block.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/garland/block.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: block.tpl.php,v 1.3 2007/08/07 08:39:36 goba Exp $
 ?>
 <div id="block-<?php print $block->module .'-'. $block->delta; ?>" class="clear-block block block-<?php print $block->module ?>">
 

=== modified file 'themes/garland/color/color.inc'
--- themes/garland/color/color.inc	2008-12-06 09:02:33 +0000
+++ themes/garland/color/color.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: color.inc,v 1.4 2007/12/14 17:00:14 goba Exp $
 
 $info = array(
 

=== modified file 'themes/garland/color/preview.css'
--- themes/garland/color/preview.css	2008-12-06 09:02:33 +0000
+++ themes/garland/color/preview.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: preview.css,v 1.1 2006/10/29 13:17:38 unconed Exp $ */
 
 /* Positioning */
 #preview {

=== modified file 'themes/garland/comment.tpl.php'
--- themes/garland/comment.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/garland/comment.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment.tpl.php,v 1.10 2008/01/04 19:24:24 goba Exp $
 ?>
 <div class="comment<?php print ($comment->new) ? ' comment-new' : ''; print ' '. $status; print ' '. $zebra; ?>">
 

=== modified file 'themes/garland/fix-ie-rtl.css'
--- themes/garland/fix-ie-rtl.css	2008-12-06 09:02:33 +0000
+++ themes/garland/fix-ie-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: fix-ie-rtl.css,v 1.2 2007/11/09 22:14:41 goba Exp $ */
 
 body {
   /* Center layout */

=== modified file 'themes/garland/fix-ie.css'
--- themes/garland/fix-ie.css	2008-12-06 09:02:33 +0000
+++ themes/garland/fix-ie.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: fix-ie.css,v 1.8.2.1 2008/02/05 09:27:26 goba Exp $ */
 
 /**
  * Garland, for Drupal 6.x

=== modified file 'themes/garland/garland.info'
--- themes/garland/garland.info	2010-12-16 19:28:18 +0000
+++ themes/garland/garland.info	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-; $Id: garland.info,v 1.5 2007/07/01 23:27:32 goba Exp $
 name = Garland
 description = Tableless, recolorable, multi-column, fluid width theme (default).
 version = VERSION
@@ -7,8 +6,8 @@
 stylesheets[all][] = style.css
 stylesheets[print][] = print.css
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'themes/garland/maintenance-page.tpl.php'
--- themes/garland/maintenance-page.tpl.php	2009-04-30 00:36:53 +0000
+++ themes/garland/maintenance-page.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: maintenance-page.tpl.php,v 1.3.2.1 2009/04/30 00:13:31 goba Exp $
 
 /**
  * @file maintenance-page.tpl.php

=== modified file 'themes/garland/minnelli/color/color.inc'
--- themes/garland/minnelli/color/color.inc	2008-12-06 09:02:33 +0000
+++ themes/garland/minnelli/color/color.inc	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: color.inc,v 1.4 2007/12/14 17:00:14 goba Exp $
 
 $info = array(
 

=== modified file 'themes/garland/minnelli/minnelli.css'
--- themes/garland/minnelli/minnelli.css	2008-12-06 09:02:33 +0000
+++ themes/garland/minnelli/minnelli.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: minnelli.css,v 1.3.2.1 2008/02/05 09:27:26 goba Exp $ */
 
 /**
  * Minnelli, for Drupal 6.x

=== modified file 'themes/garland/minnelli/minnelli.info'
--- themes/garland/minnelli/minnelli.info	2010-12-16 19:28:18 +0000
+++ themes/garland/minnelli/minnelli.info	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-; $Id: minnelli.info,v 1.7 2007/12/04 20:58:44 goba Exp $
 name = Minnelli
 description = Tableless, recolorable, multi-column, fixed width theme.
 version = VERSION
@@ -6,8 +5,8 @@
 base theme = garland
 stylesheets[all][] = minnelli.css
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'themes/garland/node.tpl.php'
--- themes/garland/node.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/garland/node.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: node.tpl.php,v 1.5 2007/10/11 09:51:29 goba Exp $
 ?>
 <div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?>">
 

=== modified file 'themes/garland/page.tpl.php'
--- themes/garland/page.tpl.php	2009-04-30 00:36:53 +0000
+++ themes/garland/page.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: page.tpl.php,v 1.18.2.1 2009/04/30 00:13:31 goba Exp $
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">

=== modified file 'themes/garland/print.css'
--- themes/garland/print.css	2010-08-11 20:54:17 +0000
+++ themes/garland/print.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: print.css,v 1.3.2.1 2010/08/06 11:37:38 goba Exp $ */
 
 /**
  * Garland, for Drupal 5.0

=== modified file 'themes/garland/style-rtl.css'
--- themes/garland/style-rtl.css	2008-12-06 09:02:33 +0000
+++ themes/garland/style-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style-rtl.css,v 1.6 2007/12/17 15:05:10 goba Exp $ */
 
 html {
   direction: rtl;

=== modified file 'themes/garland/style.css'
--- themes/garland/style.css	2009-09-16 19:57:16 +0000
+++ themes/garland/style.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style.css,v 1.38.2.4 2009/09/14 13:10:47 goba Exp $ */
 
 /**
  * Garland, for Drupal 6.x

=== modified file 'themes/garland/template.php'
--- themes/garland/template.php	2010-06-14 21:58:50 +0000
+++ themes/garland/template.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: template.php,v 1.16.2.3 2010/05/11 09:41:22 goba Exp $
 
 /**
  * Sets the body-tag class attribute.

=== modified file 'themes/pushbutton/block.tpl.php'
--- themes/pushbutton/block.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/pushbutton/block.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: block.tpl.php,v 1.2 2007/08/07 08:39:36 goba Exp $
 ?>
 <div class="<?php print "block block-$block->module" ?>" id="<?php print "block-$block->module-$block->delta"; ?>">
   <div class="title"><h3><?php print $block->subject ?></h3></div>

=== modified file 'themes/pushbutton/box.tpl.php'
--- themes/pushbutton/box.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/pushbutton/box.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: box.tpl.php,v 1.3 2007/08/07 08:39:36 goba Exp $
 ?>
 <div class="box">
   <?php if ($title): ?>

=== modified file 'themes/pushbutton/comment.tpl.php'
--- themes/pushbutton/comment.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/pushbutton/comment.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: comment.tpl.php,v 1.6 2008/01/04 19:24:24 goba Exp $
 ?>
 <div class="comment<?php print ' '. $status; ?>">
   <?php if ($picture) : ?>

=== modified file 'themes/pushbutton/logo-active.jpg' (properties changed: +x to -x)
=== modified file 'themes/pushbutton/logo-background.jpg' (properties changed: +x to -x)
=== modified file 'themes/pushbutton/logo-hover.jpg' (properties changed: +x to -x)
=== modified file 'themes/pushbutton/logo.png' (properties changed: +x to -x)
=== modified file 'themes/pushbutton/node.tpl.php'
--- themes/pushbutton/node.tpl.php	2008-12-06 09:02:33 +0000
+++ themes/pushbutton/node.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: node.tpl.php,v 1.4 2007/08/07 08:39:36 goba Exp $
 ?>
 <div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?>">
   <?php print $picture ?>

=== modified file 'themes/pushbutton/page.tpl.php'
--- themes/pushbutton/page.tpl.php	2009-04-30 00:36:53 +0000
+++ themes/pushbutton/page.tpl.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: page.tpl.php,v 1.25.2.2 2009/04/30 00:13:31 goba Exp $
 ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="<?php print $language->language ?>" xml:lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
 <head>

=== modified file 'themes/pushbutton/pushbutton.info'
--- themes/pushbutton/pushbutton.info	2010-12-16 19:28:18 +0000
+++ themes/pushbutton/pushbutton.info	2011-07-29 12:42:31 +0000
@@ -1,12 +1,11 @@
-; $Id: pushbutton.info,v 1.4 2007/06/08 05:50:58 dries Exp $
 name = Pushbutton
 description = Tabled, multi-column theme in blue and orange tones.
 version = VERSION
 core = 6.x
 engine = phptemplate
 
-; Information added by drupal.org packaging script on 2010-12-15
-version = "6.20"
+; Information added by drupal.org packaging script on 2011-05-25
+version = "6.22"
 project = "drupal"
-datestamp = "1292447788"
+datestamp = "1306357015"
 

=== modified file 'themes/pushbutton/style-rtl.css'
--- themes/pushbutton/style-rtl.css	2008-12-06 09:02:33 +0000
+++ themes/pushbutton/style-rtl.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style-rtl.css,v 1.4 2008/01/25 21:20:26 goba Exp $ */
 
 body {
   direction: rtl;

=== modified file 'themes/pushbutton/style.css'
--- themes/pushbutton/style.css	2008-12-06 09:02:33 +0000
+++ themes/pushbutton/style.css	2011-07-29 12:42:31 +0000
@@ -1,4 +1,3 @@
-/* $Id: style.css,v 1.24 2007/12/22 23:24:26 goba Exp $ */
 
 /*
 ** HTML elements

=== modified file 'update.php'
--- update.php	2010-12-16 19:39:23 +0000
+++ update.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: update.php,v 1.252.2.4 2010/11/03 12:29:24 goba Exp $
 
 /**
  * @file
@@ -346,8 +345,8 @@
           if (!count($queries)) {
             $output .= '<li class="none">No queries</li>';
           }
+          $output .= '</ul>';
         }
-        $output .= '</ul>';
       }
     }
     $output .= '</div>';

=== modified file 'xmlrpc.php'
--- xmlrpc.php	2008-12-06 09:02:33 +0000
+++ xmlrpc.php	2011-07-29 12:42:31 +0000
@@ -1,5 +1,4 @@
 <?php
-// $Id: xmlrpc.php,v 1.15 2005/12/10 19:26:47 dries Exp $
 
 /**
  * @file