Partially reverted commit a987a4a

diff --git a/wcfsetup/install/files/acp/templates/cronjobList.tpl b/wcfsetup/install/files/acp/templates/cronjobList.tpl
index c54df8fd54e4c7b666e15bf1b71e3954e91cb18c..69b107926f72d57eeac77249bcceb1f88c3ab8a0 100644 (file)
--- 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 69fe0ac187b83600dc7f7679927ecdbe7f7c2171..7b14a8d50fe462edbb059501a974497ff0e19b60 100755 (executable)
--- 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 75ed3e25da0aef5e48758a283ad2c8c4f8be478a..b976c213c4648d818ec77eb3d4002a25cf3dee87 100644 (file)
--- 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 de622330ccc3a9cbbcebc2f5a25ab76e6c51f572..02bd6ebd9865cda3e055a0da1b21623ba037194d 100644 (file)
--- 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 d664a3dcd4bac38fa218ba1da8b8f4ff1837e8f7..0e1f7d44377c8e512442727dd0e19ab83c7e52dc 100644 (file)
--- 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
  */