summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-07-23 10:43:40 -0700
committerBharat Mediratta <bharat@menalto.com>2009-07-23 10:43:40 -0700
commit913d63b1a0cf45922639f43159027e7221344b73 (patch)
tree60e4f40654390204ccb7f6b260618e5127bfee45
parent1fbdf1a1e00a176686b051bb932d998ad683b2be (diff)
parent070884d9e248ba692e49949851099e4d79285ef2 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
-rw-r--r--modules/tag/controllers/tags.php4
-rw-r--r--modules/tag/helpers/tag_event.php2
-rw-r--r--modules/tag/js/tag.js2
-rw-r--r--modules/tag/views/tag_block.html.php2
4 files changed, 5 insertions, 5 deletions
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