Permalink
Browse files

Merge branch 'hotfix/44039-sec'

* hotfix/44039-sec: (61 commits)
  Sec.vulnaraility #44039: Taxonomy-Administrators can inject XSS into public pages.
  #305380 by crissearle. Update cache in blocks.
  #305380 by crissearle. Update cache in blocks.
  Added Polish translation. This is updated version of translation commited in #143028 (HEAD). Translation reviewed.
  #148793 by leafish_paul "Don't show "more tags" when all tags are already shown"
  #286666 by nburles. Add default array() to the return of tags. Taht way we always return something. Good coding practice and solves several foreach-warnings.
  #257845 by Panzi Upgrading ZH-hans translation to 6.x
  hacking in the 'more tags' translation for now
  Translations were moved from po to translations with Drupal 6
  #227910 by jgoldberg. Fixing an eronous array key, that broke the block caching.
  #198672 by boydjd, jgoldberg, leafish_paul and Rob Loach: Drupal 6 Branch
  Preparation of Drupal-6 branch. Merged all changes from DRUPAL-5 branch back into HEAD. Added de, he and hu translations from DRUPAL-5 branch. Merged changes in translations from DRUPAL-5 branch.
  #78573 by arthurf Adds caching to tagadelic. Simple and elegant caching solution. Takes different function arguments into consideration. Makes a cache for each different combination of tags, sizes and steps.
  Russian translation by Сергей Яковлев (user Sadhoo). Thank you kindly for the work and the time!
  Japanese translation
  Galicia (gl) translation.
  Spanish translation provided by Manuel Márquez Garrido
  #101711 by hickory: fix the nodeapi with the latest 5.x changes.
  Updated the PO Template file for tagadelic with the tagadelic module in HEAD.
  In preparation of a 5.0 release: Committed a patch that * Changes the t() tokens * Changes the hook_settings * Changes the API to add the CSS file * Removes the obsolete part from hook_help
  ...

Conflicts:
	tagadelic.css
	tagadelic.info
	tagadelic.install
	tagadelic.module
	translations/de.po
	translations/hu.po
	translations/ja.po
	translations/nl.po
	translations/pl.po
  • Loading branch information...
2 parents fa04968 + da68e63 commit 976344a8539157fc4200417fbf8a5b9592092ede Bèr Kessels committed Apr 5, 2011
Showing with 0 additions and 5 deletions.
  1. +0 −1 tagadelic.css
  2. +0 −2 tagadelic.install
  3. +0 −2 tagadelic.module
View
@@ -1,4 +1,3 @@
-/*$Id: tagadelic.css,v 1.4 2008/05/01 12:48:05 ber Exp $*/
/* Tagadelic default example stylesheet **/
.wrapper.tagadelic {
View
@@ -1,6 +1,4 @@
<?php
-// $Id: tagadelic.install,v 1.1.2.2 2008/12/31 11:43:29 ber Exp $
-
/**
* @file
* Installation/updates for tagadelic.
View
@@ -1,6 +1,4 @@
<?php
-// $Id: tagadelic.module,v 1.40.2.6 2009/05/13 16:56:12 ber Exp $
-
/**
* Implements hook_help().
*/

0 comments on commit 976344a

Please sign in to comment.