RomanL 8 лет назад
Родитель
Сommit
a57fd3e3de

+ 7 - 5
inc/classes/BxDolMetatags.php

@@ -390,7 +390,7 @@ class BxDolMetatags extends BxDolFactory implements iBxDolFactoryObject
             return $s;
 
         foreach ($a as $sKeyword)
-            $s = str_ireplace('#' . $sKeyword, '<a class="bx-tag" rel="tag" href="' . $this->keywordsGetHashTagUrl($sKeyword) . '"><s>#</s><b>' . $sKeyword . '</b></a>', $s);
+            $s = str_ireplace('#' . $sKeyword, '<a class="bx-tag" rel="tag" href="' . $this->keywordsGetHashTagUrl($sKeyword, $iId) . '"><s>#</s><b>' . $sKeyword . '</b></a>', $s);
 
         return $s;
     }
@@ -409,17 +409,19 @@ class BxDolMetatags extends BxDolFactory implements iBxDolFactoryObject
     
         foreach ($a as $sKeyword)
             if (0 === strcasecmp(mb_strtolower($s), mb_strtolower($sKeyword)))
-                $s = '<a class="bx-tag" rel="tag" href="' . $this->keywordsGetHashTagUrl($sKeyword) . '">' . $sKeyword . '</a>';
+                $s = '<a class="bx-tag" rel="tag" href="' . $this->keywordsGetHashTagUrl($sKeyword, $iId) . '">' . $sKeyword . '</a>';
 
         return $s;
     }
 	
-	public function keywordsGetHashTagUrl($sKeyword) 
+	public function keywordsGetHashTagUrl($sKeyword, $iId) 
     {   
         $sUrl = BX_DOL_URL_ROOT . 'searchKeyword.php?type=keyword&keyword=' . rawurlencode($sKeyword);
-        bx_alert('meta_keyword', 'add_url', 0, false, array(
+        bx_alert('meta_keyword', 'url', 0, false, array(
            'url' => &$sUrl,
-           'keyword' => $sKeyword
+           'keyword' => $sKeyword,
+		   'id' => $iId,
+		   'sObject' => $this->_sObject
         ));
 	    return $sUrl;
 	}

+ 4 - 2
inc/classes/BxDolMetatagsQuery.php

@@ -49,8 +49,10 @@ class BxDolMetatagsQuery extends BxDolDb
 
     public function keywordsDelete($mixedContentId)
     {
-        bx_alert('meta_keyword', 'deleted', $mixedContentId, bx_get_logged_profile_id(), array('object' => $this->_aObject['object']));
-        return $this->metaDelete($this->_aObject['table_keywords'], $mixedContentId);
+        $mixedResult = $this->metaDelete($this->_aObject['table_keywords'], $mixedContentId);
+        if ($mixedResult != false)
+            bx_alert('meta_keyword', 'deleted', $mixedContentId, bx_get_logged_profile_id(), array('object' => $this->_aObject['object']));
+        return $mixedResult;
     }
 
     public function keywordsGet($mixedContentId)

+ 1 - 0
modules/base/groups/classes/BxBaseModGroupsMenuSnippetMeta.php

@@ -30,6 +30,7 @@ class BxBaseModGroupsMenuSnippetMeta extends BxBaseModProfileMenuSnippetMeta
     {
         if (isset($CNF['OBJECT_CONNECTIONS']))
             return $this->_getMenuItemConnection($this->_oModule->_oConfig->CNF['OBJECT_CONNECTIONS'], 'add', $aItem);
+        return false;
     }
 
     protected function _getMenuItemLeave($aItem)

+ 1 - 1
modules/boonex/channels/classes/BxCnlAlertsResponse.php

@@ -27,7 +27,7 @@ class BxCnlAlertsResponse extends BxBaseModGroupsAlertsResponse
             }
         }
         
-        if ($oAlert->sUnit == 'meta_keyword' && $oAlert->sAction == 'add_url'){
+        if ($oAlert->sUnit == 'meta_keyword' && $oAlert->sAction == 'url'){
             if (isset($oAlert->aExtras['keyword'])){
                 $sName = $oAlert->aExtras['keyword'];
                 $id = $this->_oModule->_oDb->getChannelIdByName($sName);

+ 1 - 1
modules/boonex/channels/install/sql/enable.sql

@@ -391,7 +391,7 @@ INSERT INTO `sys_alerts` (`unit`, `action`, `handler_id`) VALUES
 ('bx_channels', 'timeline_report', @iHandler),
 ('bx_channels', 'timeline_repost', @iHandler),
 ('meta_keyword', 'added', @iHandler),
-('meta_keyword', 'add_url', @iHandler),
+('meta_keyword', 'url', @iHandler),
 ('meta_keyword', 'deleted', @iHandler);