Merge branch '0.8.x' into userdesign

* 0.8.x:
  Moved url handling to its proper place, from newnotice to Notice.php
  Removed more dead code.
  Brought back borders for content, navigation, aside_primary but
  Minor margin value change
  More contrast for tabs
  UI updates:

3 files changed, 0 insertions, 102 deletions

diff --git a/actions/attachment.php b/actions/attachment.php
index 16ee723d9..e4dc0e054 100644
--- a/actions/attachment.php
+++ b/actions/attachment.php
@@ -99,48 +99,6 @@ class AttachmentAction extends Action
     }
 
     /**
-     * Last-modified date for page
-     *
-     * When was the content of this page last modified? Based on notice,
-     * profile, avatar.
-     *
-     * @return int last-modified date as unix timestamp
-     */
-/*
-    function lastModified()
-    {
-        return max(strtotime($this->notice->created),
-                   strtotime($this->profile->modified),
-                   ($this->avatar) ? strtotime($this->avatar->modified) : 0);
-    }
-*/
-
-    /**
-     * An entity tag for this page
-     *
-     * Shows the ETag for the page, based on the notice ID and timestamps
-     * for the notice, profile, and avatar. It's weak, since we change
-     * the date text "one hour ago", etc.
-     *
-     * @return string etag
-     */
-/*
-    function etag()
-    {
-        $avtime = ($this->avatar) ?
-          strtotime($this->avatar->modified) : 0;
-
-        return 'W/"' . implode(':', array($this->arg('action'),
-                                          common_language(),
-                                          $this->notice->id,
-                                          strtotime($this->notice->created),
-                                          strtotime($this->profile->modified),
-                                          $avtime)) . '"';
-    }
-*/
-
-
-    /**
      * Handle input
      *
      * Only handles get, so just show the page.
diff --git a/actions/attachment_ajax.php b/actions/attachment_ajax.php
index 3d83393c5..5d6773010 100644
--- a/actions/attachment_ajax.php
+++ b/actions/attachment_ajax.php
@@ -74,46 +74,5 @@ class Attachment_ajaxAction extends AttachmentAction
         }
         $this->elementEnd('div');
     }
-
-    /**
-     * Last-modified date for page
-     *
-     * When was the content of this page last modified? Based on notice,
-     * profile, avatar.
-     *
-     * @return int last-modified date as unix timestamp
-     */
-/*
-    function lastModified()
-    {
-        return max(strtotime($this->notice->created),
-                   strtotime($this->profile->modified),
-                   ($this->avatar) ? strtotime($this->avatar->modified) : 0);
-    }
-*/
-
-    /**
-     * An entity tag for this page
-     *
-     * Shows the ETag for the page, based on the notice ID and timestamps
-     * for the notice, profile, and avatar. It's weak, since we change
-     * the date text "one hour ago", etc.
-     *
-     * @return string etag
-     */
-/*
-    function etag()
-    {
-        $avtime = ($this->avatar) ?
-          strtotime($this->avatar->modified) : 0;
-
-        return 'W/"' . implode(':', array($this->arg('action'),
-                                          common_language(),
-                                          $this->notice->id,
-                                          strtotime($this->notice->created),
-                                          strtotime($this->profile->modified),
-                                          $avtime)) . '"';
-    }
-*/
 }
 
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 02976a2ae..72ccd8c32 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -231,7 +231,6 @@ class NewnoticeAction extends Action
         if (isset($mimetype)) {
             $this->storeFile($notice, $mimetype);
         }
-        $this->saveUrls($notice);
         common_broadcast_notice($notice);
 
         if ($this->boolean('ajax')) {
@@ -284,24 +283,6 @@ class NewnoticeAction extends Action
         }
     }
 
-    /** save all urls in the notice to the db
-     *
-     * follow redirects and save all available file information
-     * (mimetype, date, size, oembed, etc.)
-     *
-     * @param class $notice Notice to pull URLs from
-     *
-     * @return void
-     */
-    function saveUrls($notice, $uploaded = null) {
-        common_replace_urls_callback($notice->content, array($this, 'saveUrl'), $notice->id);
-    }
-
-    function saveUrl($data) {
-        list($url, $notice_id) = $data;
-        $zzz = File::processNew($url, $notice_id);
-    }
-
     /**
      * Show an Ajax-y error message
      *