Merge pull request #4270 from tractorcow/pulls/3/cleanup-changelog

Cleanup 3.2 changelog for release
silverstripe · Jun 15, 2015 · d3d28c8 · d3d28c8
2 parents 78a3f70 + 4d37e21
commit d3d28c8
Show file tree

Hide file tree

Showing 4 changed files with 541 additions and 412 deletions.
diff --git a/docs/en/02_Developer_Guides/05_Extending/How_Tos/03_Track_member_logins.md b/docs/en/02_Developer_Guides/05_Extending/How_Tos/03_Track_member_logins.md
@@ -37,7 +37,7 @@ explicitly logging in or by invoking the "remember me" functionality.
 			
 			DB::query(sprintf(
 				'UPDATE "Member" SET "LastVisited" = %s, "NumVisit" = "NumVisit" + 1 WHERE "ID" = %d',
-				DB::getConn()->now(),
+				DB::get_conn()->now(),
 				$this->owner->ID
 			));
 		}

diff --git a/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md b/docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
@@ -27,7 +27,7 @@ come from user input.
 Example:
 
 	:::php
-	$records = DB::preparedQuery('SELECT * FROM "MyClass" WHERE "ID" = ?', array(3));
+	$records = DB::prepared_query('SELECT * FROM "MyClass" WHERE "ID" = ?', array(3));
 	$records = MyClass::get()->where(array('"ID" = ?' => 3));
 	$records = MyClass::get()->where(array('"ID"' => 3));
 	$records = DataObject::get_by_id('MyClass', 3);
@@ -48,7 +48,7 @@ Parameterised updates and inserts are also supported, but the syntax is a little
 		))
 		->assignSQL('"Created"', 'NOW()')
 		->execute();
-	DB::preparedQuery(
+	DB::prepared_query(
 		'INSERT INTO "MyClass" ("Name", "Position", "Age", "Created") VALUES(?, ?, GREATEST(0,?,?), NOW())'
 		array('Daniel', 'Accountant', 24, 28)
 	);
@@ -100,7 +100,7 @@ and [datamodel](/developer_guides/model) for ways to parameterise, cast, and con
 
 *  `SQLQuery`
 *  `DB::query()`
-*  `DB::preparedQuery()`
+*  `DB::prepared_query()`
 *  `Director::urlParams()`
 *  `Controller->requestParams`, `Controller->urlParams`
 *  `SS_HTTPRequest` data