Made Model::getPk() and Model::getTable() static (see #5128)

contao · Dec 21, 2012 · 42a6660 · 42a6660
1 parent d5b01be
commit 42a6660
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/system/docs/CHANGELOG.md b/system/docs/CHANGELOG.md
@@ -4,6 +4,9 @@ Contao Open Source CMS Changelog
 Version 3.0.2 (201X-XX-XX)
 --------------------------
 
+### Fixed
+Made `Model::getPk()` and `Model::getTable()` static (see #5128).
+
 ### Fixed
 Do not move resources in the file manager if the targets exist. Otherwise the
 database might get out of sync with the file system (see #5145).

diff --git a/system/modules/core/library/Contao/Model.php b/system/modules/core/library/Contao/Model.php
@@ -170,7 +170,7 @@ public function __isset($strKey)
 	 * 
 	 * @return string The primary key
 	 */
-	public function getPk()
+	public static function getPk()
 	{
 		return static::$strPk;
 	}
@@ -181,7 +181,7 @@ public function getPk()
 	 * 
 	 * @return string The table name
 	 */
-	public function getTable()
+	public static function getTable()
 	{
 		return static::$strTable;
 	}