common_to_alphanumeric added, filtering Notice->source in classic layout

[quix0rs-gnu-social.git] / lib / activityhandlerplugin.php

diff --git a/lib/activityhandlerplugin.php b/lib/activityhandlerplugin.php
index b826a705ace80dd80f2cfe39c12c05769398dcc2..b22096be0e39148d9d048e2e585387f8985d9fd7 100644 (file)
--- a/lib/activityhandlerplugin.php
+++ b/lib/activityhandlerplugin.php
@@ -108,6 +108,7 @@ abstract class ActivityHandlerPlugin extends Plugin
     }
 
     function isMyType($type) {
+        // Third argument to compareTypes is true, to allow for notices with empty object_type for example (verb-only)
         return count($this->types())===0 || ActivityUtils::compareTypes($type, $this->types());
     }
 
@@ -182,17 +183,6 @@ abstract class ActivityHandlerPlugin extends Plugin
             return true;
         }
         $object = $this->saveObjectFromActivity($act, $stored, $options);
-        try {
-            // In the future we probably want to use something like ActivityVerb_DataObject for the kind
-            // of objects which are returned from saveObjectFromActivity.
-            if ($object instanceof Managed_DataObject) {
-                // If the verb handling plugin figured out some more attention URIs, add them here to the
-                // original activity. This is only done if a separate object is actually needed to be saved.
-                $act->context->attention = array_merge($act->context->attention, $object->getAttentionArray());
-            }
-        } catch (Exception $e) {
-            common_debug('WARNING: Could not get attention list from object '.get_class($object).'!');
-        }
         return false;
     }
 
@@ -562,6 +552,11 @@ abstract class ActivityHandlerPlugin extends Plugin
         if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
             $class .= ' limited-scope';
         }
+        try {
+            $class .= ' notice-source-'.common_to_alphanumeric($this->notice->source);
+        } catch (Exception $e) {
+            // either source or what we filtered out was a zero-length string
+        }
         $nli->out->elementStart('li', array('class' => $class,
                                             'id' => 'notice-' . $id));
     }