Merge remote-tracking branch 'remotes/gh-mjjstorey/master'

[scuttle] / edit.php

diff --git a/edit.php b/edit.php
index cca8e470585908f8c0b2e0a2f03904b23128d0e3..fbbc083a798798ea7b7f0ba45d54aab68b54d89d 100644 (file)
--- a/edit.php
+++ b/edit.php
@@ -1,7 +1,6 @@
 <?php
 /***************************************************************************
 <?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
 http://scuttle.org/
 
 This program is free software; you can redistribute it and/or modify


@@ -19,19 +18,20 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ***************************************************************************/
 
 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');
+$bookmarkservice =& ServiceFactory::getServiceInstance('BookmarkService');
+$templateservice =& ServiceFactory::getServiceInstance('TemplateService');
+$userservice     =& ServiceFactory::getServiceInstance('UserService');

 
 // Header variables
 $tplVars['subtitle'] = T_('Edit Bookmark');
 
 // Header variables
 $tplVars['subtitle'] = T_('Edit Bookmark');

-$tplVars['loadjs'] = true;
+$tplVars['loadjs']   = TRUE;

 
 list ($url, $bookmark) = explode('/', $_SERVER['PATH_INFO']);
 
 list ($url, $bookmark) = explode('/', $_SERVER['PATH_INFO']);

+

 if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) {
 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 {
     $templateservice->loadTemplate('error.404.tpl', $tplVars);
     exit();
 } else {


@@ -90,4 +90,3 @@ if (!($row = $bookmarkservice->getBookmark(intval($bookmark), true))) {
     $tplVars['referrer'] = $_SERVER['HTTP_REFERER'];
     $templateservice->loadTemplate('editbookmark.tpl', $tplVars);
 }
     $tplVars['referrer'] = $_SERVER['HTTP_REFERER'];
     $templateservice->loadTemplate('editbookmark.tpl', $tplVars);
 }

-?>