Fix bug caused by previous commit, 42f01fe. Replace instances of _Par…

…ent->Database with the Symphony instance (Fixes #414)
brendo · Oct 20, 2010 · 6c8b8b9 · 6c8b8b9
1 parent 42f01fe
commit 6c8b8b9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/symphony/content/content.blueprintspages.php b/symphony/content/content.blueprintspages.php
@@ -196,7 +196,7 @@ public function __viewTemplate() {
 			$is_child = strrpos($this->_context[1],'_');
 			$pagename = ($is_child != false ? substr($this->_context[1], $is_child + 1) : $this->_context[1]);
 
-			$pagedata = $this->_Parent->Database->fetchRow(0, "
+			$pagedata = Symphony::Database()->fetchRow(0, "
 					SELECT
 						p.*
 					FROM

diff --git a/symphony/content/content.systemauthors.php b/symphony/content/content.systemauthors.php
@@ -490,13 +490,13 @@ function __actionEdit(){
 				# Description: Prior to deleting an author. ID is provided.
 				//$ExtensionManager->notifyMembers('Delete', getCurrentPage(), array('author_id' => $author_id));
 
-				if($isOwner) {
+				if(!$isOwner) {
 					AuthorManager::delete($author_id);
 					redirect(URL . '/symphony/system/authors/');
 				}
 
 				else {
-					$this->pageAlert(__('You cannot remove yourself.'), Alert::ERROR);
+					$this->pageAlert(__('You cannot remove yourself as you are the active Author.'), Alert::ERROR);
 				}
 			}
 		}

diff --git a/symphony/lib/toolkit/class.fieldmanager.php b/symphony/lib/toolkit/class.fieldmanager.php
@@ -95,7 +95,7 @@ public function fetchFieldIDFromElementName($element_name, $section_id=NULL){
 		//}
 
 		public function fetchHandleFromElementName($id){
-			return $this->_Parent->Database->fetchVar('element_name', 0, "SELECT `element_name` FROM `tbl_fields` WHERE `id` = '$id' LIMIT 1");
+			return Symphony::Database()->fetchVar('element_name', 0, "SELECT `element_name` FROM `tbl_fields` WHERE `id` = '$id' LIMIT 1");
 		}
 
 		public function fetchTypes(){