From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 9 Sep 2011 13:36:25 +0000 (+0200)
Subject: Partially reverted commit a987a4a
X-Git-Tag: 2.0.0_Beta_1~1765^2~39
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d0512085221713b545462233c7c69687fe7aa9be;p=GitHub%2FWoltLab%2FWCF.git

Partially reverted commit a987a4a
---

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index c54df8fd54..69b107926f 100644
--- a/wcfsetup/install/files/acp/templates/cronjobList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobList.tpl
@@ -75,7 +75,7 @@
 			</thead>
 			
 			<tbody>
-			{foreach from=$cronjob item=cronjob}
+			{foreach from=$cronjobs item=cronjob}
 				<tr class="cronjobRow">
 					<td class="columnIcon">
 						{if $__wcf->session->getPermission('admin.system.cronjob.canEditCronjob')}
diff --git a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
index 69fe0ac187..7b14a8d50f 100755
--- a/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobListPage.class.php
@@ -58,7 +58,7 @@ class CronjobListPage extends SortablePage {
 		parent::assignVariables();
 		
 		WCF::getTPL()->assign(array(
-			'cronjob' => $this->objectList->getObjects()
+			'cronjobs' => $this->objectList->getObjects()
 		));
 	}
 	
diff --git a/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php b/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
index 75ed3e25da..b976c213c4 100644
--- a/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
+++ b/wcfsetup/install/files/lib/data/cronjob/CronjobEditor.class.php
@@ -25,6 +25,6 @@ class CronjobEditor extends DatabaseObjectEditor implements IEditableCachedObjec
 	 * @see wcf\data\IEditableCachedObject::resetCache()
 	 */
 	public static function resetCache() {
-		CacheHandler::getInstance()->clear(WCF_DIR.'cache', 'cache.cronjob-*');
+		CacheHandler::getInstance()->clear(WCF_DIR.'cache', 'cache.cronjobs-*');
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
index de622330cc..02bd6ebd98 100644
--- a/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/CronjobScheduler.class.php
@@ -197,7 +197,7 @@ class CronjobScheduler extends SingletonFactory {
 	 * Loads the cached data for cronjob execution.
 	 */
 	protected function loadCache() {
-		$cacheName = 'cronjob-'.PACKAGE_ID;
+		$cacheName = 'cronjobs-'.PACKAGE_ID;
 		CacheHandler::getInstance()->addResource(
 			$cacheName,
 			WCF_DIR.'cache/cache.'.$cacheName.'.php',
@@ -210,6 +210,6 @@ class CronjobScheduler extends SingletonFactory {
 	 * Clears the cronjob data cache.
 	 */
 	public static function clearCache() {
-		CacheHandler::getInstance()->clear(WCF_DIR.'cache/', 'cache.cronjob-'.PACKAGE_ID.'.php');
+		CacheHandler::getInstance()->clear(WCF_DIR.'cache/', 'cache.cronjobs-'.PACKAGE_ID.'.php');
 	}
 }
diff --git a/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php b/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php
index d664a3dcd4..0e1f7d4437 100644
--- a/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php
+++ b/wcfsetup/install/files/lib/system/cronjob/ICronjob.class.php
@@ -8,7 +8,7 @@ use wcf\data\cronjob\Cronjob;
  * @author	Siegfried Schweizer
  * @copyright	2001-2011 WoltLab GmbH
  * @license	GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
- * @package	com.woltlab.wcf.data.cronjob
+ * @package	com.woltlab.wcf
  * @subpackage	system.cronjob
  * @category 	Community Framework
  */