Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
2 parents e648891 + 2dd33b4 commit 5fa0052983102b3e1920d001fc9e8039f9377447 @FatherShawn FatherShawn committed Dec 6, 2011
Showing with 237 additions and 4,106 deletions.
  1. +0 −1 profiles/cod/modules/contrib/flag/README.txt
  2. +3 −8 profiles/cod/modules/contrib/flag/flag.inc
  3. +3 −4 profiles/cod/modules/contrib/flag/flag.info
  4. +24 −2 profiles/cod/modules/contrib/flag/flag.install
  5. +55 −127 profiles/cod/modules/contrib/flag/flag.module
  6. +3 −4 profiles/cod/modules/contrib/flag/flag_actions.info
  7. +0 −1 profiles/cod/modules/contrib/flag/flag_actions.install
  8. +0 −1 profiles/cod/modules/contrib/flag/flag_actions.module
  9. +0 −1 profiles/cod/modules/contrib/flag/includes/flag.actions.inc
  10. +0 −66 profiles/cod/modules/contrib/flag/includes/flag.activity.inc
  11. +2 −3 profiles/cod/modules/contrib/flag/includes/flag.admin.inc
  12. +7 −3 profiles/cod/modules/contrib/flag/includes/flag.export.inc
  13. +0 −1 profiles/cod/modules/contrib/flag/includes/flag.features.inc
  14. +0 −1 profiles/cod/modules/contrib/flag/includes/flag.rules.inc
  15. +0 −1 profiles/cod/modules/contrib/flag/includes/flag.rules_forms.inc
  16. +0 −1 profiles/cod/modules/contrib/flag/includes/flag.services.inc
  17. +2 −1 profiles/cod/modules/contrib/flag/includes/flag.token.inc
  18. +30 −29 profiles/cod/modules/contrib/flag/includes/flag.views.inc
  19. +0 −1 profiles/cod/modules/contrib/flag/includes/flag.views_bookmark.inc
  20. +0 −1 profiles/cod/modules/contrib/flag/includes/flag.views_convert.inc
  21. +8 −1 profiles/cod/modules/contrib/flag/includes/flag.views_default.inc
  22. +0 −1 profiles/cod/modules/contrib/flag/includes/flag_handler_argument_content_id.inc
  23. +0 −1 profiles/cod/modules/contrib/flag/includes/flag_handler_field_ops.inc
  24. +1 −5 profiles/cod/modules/contrib/flag/includes/flag_handler_filter_flagged.inc
  25. +0 −1 profiles/cod/modules/contrib/flag/includes/flag_handler_relationships.inc
  26. +0 −1 profiles/cod/modules/contrib/flag/includes/flag_plugin_argument_validate_flaggability.inc
  27. +4 −4 profiles/cod/modules/contrib/flag/tests/flag.test
  28. +0 −1 profiles/cod/modules/contrib/flag/theme/README.txt
  29. +0 −1 profiles/cod/modules/contrib/flag/theme/flag-admin.css
  30. +0 −1 profiles/cod/modules/contrib/flag/theme/flag-admin.js
  31. +0 −1 profiles/cod/modules/contrib/flag/theme/flag.css
  32. +0 −1 profiles/cod/modules/contrib/flag/theme/flag.js
  33. +2 −12 profiles/cod/modules/contrib/flag/theme/flag.tpl.php
  34. +0 −1,538 profiles/cod/modules/contrib/flag/translations/da.po
  35. +0 −1,048 profiles/cod/modules/contrib/flag/translations/de.po
  36. +0 −1,180 profiles/cod/modules/contrib/flag/translations/fr.po
  37. +9 −2 profiles/cod/modules/contrib/views/handlers/views_handler_field.inc
  38. +2 −2 profiles/cod/modules/contrib/views/handlers/views_handler_field_custom.inc
  39. +5 −3 profiles/cod/modules/contrib/views/help/api-tables.html
  40. +15 −1 profiles/cod/modules/contrib/views/includes/handlers.inc
  41. +16 −1 profiles/cod/modules/contrib/views/includes/view.inc
  42. +8 −8 profiles/cod/modules/contrib/views/modules/taxonomy.views.inc
  43. +29 −26 profiles/cod/modules/contrib/views/modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
  44. +3 −3 profiles/cod/modules/contrib/views/views.info
  45. +3 −3 profiles/cod/modules/contrib/views/views_export/views_export.info
  46. +3 −3 profiles/cod/modules/contrib/views/views_ui.info
@@ -1,4 +1,3 @@
-// $Id: README.txt,v 1.1.4.6.2.1 2009/10/28 00:01:31 quicksketch Exp $
You may want to visit the handbook of this module, at:
@@ -1,5 +1,4 @@
<?php
-// $Id: flag.inc,v 1.1.2.30.2.39 2011/01/03 15:52:45 mooffie Exp $
/**
* @file
@@ -122,10 +121,8 @@ class flag_flag {
* is because the class to instantiate changes according to the 'content_type'
* database column. This design pattern is known as the "Single Table
* Inheritance".
- *
- * @static
*/
- function factory_by_row($row) {
+ static function factory_by_row($row) {
$flag = flag_create_handler($row->content_type);
// Lump all data unto the object...
@@ -155,7 +152,7 @@ class flag_flag {
/**
* Create a complete flag (except an FID) from an array definition.
*/
- function factory_by_array($config) {
+ static function factory_by_array($config) {
$flag = flag_create_handler($config['content_type']);
foreach ($config as $option => $value) {
@@ -172,10 +169,8 @@ class flag_flag {
/**
* Another factory method. Returns a new, "empty" flag; e.g., one suitable for
* the "Add new flag" page.
- *
- * @static
*/
- function factory_by_content_type($content_type) {
+ static function factory_by_content_type($content_type) {
return flag_create_handler($content_type);
}
@@ -1,13 +1,12 @@
-; $Id: flag.info,v 1.2.2.2.2.1 2010/12/16 15:24:06 mooffie Exp $
name = Flag
description = Create customized flags that users can set on content.
core = 6.x
package = Flags
php = 5
-; Information added by drupal.org packaging script on 2011-01-12
-version = "6.x-2.0-beta5"
+; Information added by drupal.org packaging script on 2011-09-08
+version = "6.x-2.0-beta6"
core = "6.x"
project = "flag"
-datestamp = "1294830679"
+datestamp = "1315511524"
@@ -1,5 +1,4 @@
<?php
-// $Id: flag.install,v 1.2.2.32.2.11 2010/11/09 06:57:05 mooffie Exp $
/**
* @file
@@ -156,38 +155,45 @@ function flag_schema() {
$schema = array();
$schema['flags'] = array(
+ 'description' => 'All available flags in the system.',
'fields' => array(
'fid' => array(
+ 'description' => 'The unique ID for this particular flag.',
'type' => 'serial',
'size' => 'small',
'unsigned' => TRUE,
'not null' => TRUE,
),
'content_type' => array(
+ 'description' => 'The flag type, such as one of "node", "comment", or "user".',
'type' => 'varchar',
'length' => '32',
'not null' => TRUE,
'default' => '',
),
'name' => array(
+ 'description' => 'The machine-name for this flag.',
'type' => 'varchar',
'length' => '32',
'not null' => FALSE,
'default' => '',
),
'title' => array(
+ 'description' => 'The human-readable title for this flag.',
'type' => 'varchar',
'length' => '255',
'not null' => FALSE,
'default' => '',
),
'global' => array(
+ 'description' => 'Whether this flag state should act as a single toggle to all users across the site.',
'type' => 'int',
'size' => 'tiny',
'not null' => FALSE,
'default' => 0,
),
'options' => array(
+ 'description' => 'The options and configuration of this flag.',
'type' => 'text',
'not null' => FALSE,
),
@@ -199,44 +205,52 @@ function flag_schema() {
);
$schema['flag_content'] = array(
+ 'description' => 'Content that has been flagged.',
'fields' => array(
'fcid' => array(
+ 'description' => 'The unique ID for this particular tag.',
'type' => 'serial',
'unsigned' => TRUE,
'not null' => TRUE,
),
'fid' => array(
+ 'description' => 'The unqiue flag ID this content has been flagged with, from {flags}.',
'type' => 'int',
'size' => 'small',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
'content_type' => array(
+ 'description' => 'The flag type, one of "node", "comment", "user".',
'type' => 'varchar',
'length' => '32',
'not null' => TRUE,
'default' => '',
),
'content_id' => array(
+ 'description' => 'The unique ID of the content, such as either the {cid}, {uid}, or {nid}.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
'uid' => array(
+ 'description' => 'The user ID by which this content was created.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
'sid' => array(
+ 'description' => "The user's session id as stored in the session table.",
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
'timestamp' => array(
+ 'description' => 'The UNIX time stamp representing when the flag was set.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
@@ -255,26 +269,31 @@ function flag_schema() {
);
$schema['flag_types'] = array(
+ 'description' => 'The types (usually as defined in {node_type}) that are affected by a flag.',
'fields' => array(
'fid' => array(
+ 'description' => 'The unqiue flag ID as defined for the flag in {flags}.',
'type' => 'int',
'size' => 'small',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
),
'type' => array(
+ 'description' => 'The types (usually from {node_type}) that can be flagged by this fid.',
'type' => 'varchar',
'length' => '32',
'not null' => TRUE,
- 'default' => '')
+ 'default' => '',
+ ),
),
'indexes' => array(
'fid' => array('fid'),
),
);
$schema['flag_counts'] = array(
+ 'description' => 'The number of times an item has been flagged.',
'fields' => array(
'fid' => array(
'type' => 'int',
@@ -284,19 +303,22 @@ function flag_schema() {
'default' => 0,
),
'content_type' => array(
+ 'description' => 'The flag type, usually one of "node", "comment", "user".',
'type' => 'varchar',
'length' => '32',
'not null' => TRUE,
'default' => '',
),
'content_id' => array(
+ 'description' => 'The unique ID of the content, usually either the {cid}, {uid}, or {nid}.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
'default' => 0,
'disp-width' => '10',
),
'count' => array(
+ 'description' => 'The number of times this content has been flagged for this flag.',
'type' => 'int',
'unsigned' => TRUE,
'not null' => TRUE,
Oops, something went wrong.

0 comments on commit 5fa0052

Please sign in to comment.