diff options
| author | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-23 19:44:40 +0200 |
|---|---|---|
| committer | Romain LE DISEZ <romain.git@ledisez.net> | 2009-07-23 19:44:40 +0200 |
| commit | b181707c1651af8737c2e6ff550fd20f480b781b (patch) | |
| tree | a39b32912bdb37cbf213d146d8be47f028e88590 | |
| parent | 386130114b3e3a9cf1617a1ea62407f569ee391c (diff) | |
| parent | 070884d9e248ba692e49949851099e4d79285ef2 (diff) | |
Merge commit 'upstream/master'
Conflicts:
modules/gallery/helpers/access.php
| -rw-r--r-- | modules/gallery/helpers/access.php | 2 | ||||
| -rw-r--r-- | modules/tag/controllers/tags.php | 4 | ||||
| -rw-r--r-- | modules/tag/helpers/tag_event.php | 2 | ||||
| -rw-r--r-- | modules/tag/js/tag.js | 2 | ||||
| -rw-r--r-- | modules/tag/views/tag_block.html.php | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php index b5be192c..c84527f4 100644 --- a/modules/gallery/helpers/access.php +++ b/modules/gallery/helpers/access.php @@ -142,7 +142,7 @@ class access_Core { * @param Group_Model $group * @param string $perm_name * @param Item_Model $item - * @return boolean access::ALLOW, ccess::DENY or access::INHERIT (null) for no intent + * @return boolean access::ALLOW, access::DENY or access::INHERIT (null) for no intent */ static function group_intent($group, $perm_name, $item) { $intent = model_cache::get("access_intent", $item->id, "item_id"); diff --git a/modules/tag/controllers/tags.php b/modules/tag/controllers/tags.php index 85f6d16e..5dd07935 100644 --- a/modules/tag/controllers/tags.php +++ b/modules/tag/controllers/tags.php @@ -53,10 +53,10 @@ class Tags_Controller extends REST_Controller { $form = tag::get_add_form($item); if ($form->validate()) { - foreach (split("[\,\ \;]", $form->add_tag->inputs["name"]->value) as $tag_name) { + foreach (split("[\,\;]", $form->add_tag->inputs["name"]->value) as $tag_name) { $tag_name = trim($tag_name); if ($tag_name) { - $tag = tag::add($item, $tag_name); + $tag = tag::add($item, str_replace(" ", ".", $tag_name)); } } diff --git a/modules/tag/helpers/tag_event.php b/modules/tag/helpers/tag_event.php index d13d1340..e1ab1b73 100644 --- a/modules/tag/helpers/tag_event.php +++ b/modules/tag/helpers/tag_event.php @@ -74,7 +74,7 @@ class tag_event_Core { tag::clear_all($item); foreach (preg_split("/[,;]/", $form->edit_item->tags->value) as $tag_name) { if ($tag_name) { - tag::add($item, $tag_name); + tag::add($item, str_replace(" ", ".", $tag_name)); } } tag::compact(); diff --git a/modules/tag/js/tag.js b/modules/tag/js/tag.js index a1eaeecd..a5aaa3f8 100644 --- a/modules/tag/js/tag.js +++ b/modules/tag/js/tag.js @@ -7,7 +7,7 @@ function ajaxify_tag_form() { dataType: "json", success: function(data) { if (data.result == "success") { - $.get($("#gTagCloud").attr("src"), function(data, textStatus) { + $.get($("#gTagCloud").attr("title"), function(data, textStatus) { $("#gTagCloud").html(data); }); } diff --git a/modules/tag/views/tag_block.html.php b/modules/tag/views/tag_block.html.php index 9c8f3de5..12c90857 100644 --- a/modules/tag/views/tag_block.html.php +++ b/modules/tag/views/tag_block.html.php @@ -1,5 +1,5 @@ <?php defined("SYSPATH") or die("No direct script access.") ?> -<div id="gTagCloud" src="<?= url::site("tags") ?>"> +<div id="gTagCloud" title="<?= url::site("tags") ?>"> <?= $cloud ?> </div> <?= $form ?>
\ No newline at end of file |