Merge commit 'upstream/master'

Conflicts: modules/gallery/helpers/access.php
gallery · Jul 23, 2009 · b181707 · b181707
2 parents 3861301 + 070884d
commit b181707
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/modules/gallery/helpers/access.php b/modules/gallery/helpers/access.php
@@ -142,7 +142,7 @@ static function group_can($group, $perm_name, $item) {
    * @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
@@ -53,10 +53,10 @@ public function _create($tag) {
 
     $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
@@ -74,7 +74,7 @@ static function item_edit_form_completed($item, $form) {
     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
@@ -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
@@ -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 ?>