updated readme with information on a series of bugs I know exist

[scuttle] / edit.php

diff --git a/edit.php b/edit.php
index 028e8bae52eb1edd926f64e71c8196df323eac4f..0358a4d1cffdff274724767f7dc687c2cd781adc 100644 (file)
--- a/edit.php
+++ b/edit.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
-Copyright (C) 2004 - 2006 Scuttle project
-http://sourceforge.net/projects/scuttle/
+Copyright (c) 2004 - 2010 Marcus Campbell
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify
@@ -19,19 +18,21 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
-require_once('header.inc.php');
+require_once 'header.inc.php';
 
-$bookmarkservice = & ServiceFactory :: getServiceInstance('BookmarkService');
-$templateservice = & ServiceFactory :: getServiceInstance('TemplateService');
-$userservice = & ServiceFactory :: getServiceInstance('UserService');
+$sf = new ServiceFactory();
+$bookmarkservice =& $sf->getServiceInstance('BookmarkService');
+$templateservice =& $sf->getServiceInstance('TemplateService');
+$userservice     =& $sf->getServiceInstance('UserService');
 
 // Header variables
 $tplVars['subtitle'] = T_('Edit Bookmark');
-$tplVars['loadjs'] = true;
+$tplVars['loadjs']   = TRUE;
 
 list ($url, $bookmark) = explode('/', $_SERVER['PATH_INFO']);
+
 if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) {
-    $tplVars['error'] = sprintf(T_('Bookmark with id %s not was not found'), $bookmark);
+    $tplVars['error'] = sprintf(T_('Bookmark with id %s was not found'), $bookmark);
     $templateservice->loadTemplate('error.404.tpl', $tplVars);
     exit();
 } else {
@@ -90,4 +91,3 @@ if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) {
     $tplVars['referrer'] = $_SERVER['HTTP_REFERER'];
     $templateservice->loadTemplate('editbookmark.tpl', $tplVars);
 }
-?>