Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bug fixes.

  • Loading branch information...
commit 1039a89eed2ca010e05826ac64b5da4977ec47d3 1 parent bacf936
Drak authored
View
5 src/lib/Zikula/Core/Doctrine/Entity/Extension.php
@@ -115,6 +115,11 @@ public function getId()
return $this->id;
}
+ public function setId($id)
+ {
+ $this->id = $id;
+ }
+
public function getName()
{
return $this->name;
View
252 ...Doctrine/Entity/ExtensionDependencies.php → ...e/Doctrine/Entity/ExtensionDependency.php
@@ -1,126 +1,126 @@
-<?php
-/**
- * Copyright Zikula Foundation 2009 - Zikula Application Framework
- *
- * This work is contributed to the Zikula Foundation under one or more
- * Contributor Agreements and licensed to You under the following license:
- *
- * @license GNU/LGPLv3 (or at your option, any later version).
- * @package Zikula_Form
- *
- * Please see the NOTICE file distributed with this source code for further
- * information regarding copyright and licensing.
- */
-
-namespace Zikula\Core\Doctrine\Entity;
-use Zikula\Core\Doctrine\EntityAccess;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * Extension dependencies.
- *
- * @ORM\Entity
- * @ORM\Table(name="module_deps")
- */
-class ExtensionDependencies extends EntityAccess
-{
- /**
- * @ORM\Id
- * @ORM\GeneratedValue
- * @ORM\Column(type="integer")
- * @var integer
- */
- private $id;
-
- /**
- * @ORM\Column(type="integer")
- * @var integer
- */
- private $modid;
-
- /**
- * @ORM\Column(type="string", length=64)
- * @var string
- */
- private $modname;
-
- /**
- * @ORM\Column(type="string", length=10)
- * @var string
- */
- private $minversion;
-
- /**
- * @ORM\Column(type="string", length=10)
- * @var string
- */
- private $maxversion;
-
- /**
- * @ORM\Column(type="integer", length=64)
- * @var integer
- */
- private $status;
-
- public function getId()
- {
- return $this->id;
- }
-
- public function setId($id)
- {
- $this->id = $id;
- }
-
- public function getModid()
- {
- return $this->modid;
- }
-
- public function setModid($modid)
- {
- $this->modid = $modid;
- }
-
- public function getModname()
- {
- return $this->modname;
- }
-
- public function setModname($modname)
- {
- $this->modname = $modname;
- }
-
- public function getMinversion()
- {
- return $this->minversion;
- }
-
- public function setMinversion($minversion)
- {
- $this->minversion = $minversion;
- }
-
- public function getMaxversion()
- {
- return $this->maxversion;
- }
-
- public function setMaxversion($maxversion)
- {
- $this->maxversion = $maxversion;
- }
-
- public function getStatus()
- {
- return $this->status;
- }
-
- public function setStatus($status)
- {
- $this->status = $status;
- }
-
-
-}
+<?php
+/**
+ * Copyright Zikula Foundation 2009 - Zikula Application Framework
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ * @package Zikula_Form
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+namespace Zikula\Core\Doctrine\Entity;
+use Zikula\Core\Doctrine\EntityAccess;
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * Extension dependencies.
+ *
+ * @ORM\Entity
+ * @ORM\Table(name="module_deps")
+ */
+class ExtensionDependency extends EntityAccess
+{
+ /**
+ * @ORM\Id
+ * @ORM\GeneratedValue
+ * @ORM\Column(type="integer")
+ * @var integer
+ */
+ private $id;
+
+ /**
+ * @ORM\Column(type="integer")
+ * @var integer
+ */
+ private $modid;
+
+ /**
+ * @ORM\Column(type="string", length=64)
+ * @var string
+ */
+ private $modname;
+
+ /**
+ * @ORM\Column(type="string", length=10)
+ * @var string
+ */
+ private $minversion;
+
+ /**
+ * @ORM\Column(type="string", length=10)
+ * @var string
+ */
+ private $maxversion;
+
+ /**
+ * @ORM\Column(type="integer", length=64)
+ * @var integer
+ */
+ private $status;
+
+ public function getId()
+ {
+ return $this->id;
+ }
+
+ public function setId($id)
+ {
+ $this->id = $id;
+ }
+
+ public function getModid()
+ {
+ return $this->modid;
+ }
+
+ public function setModid($modid)
+ {
+ $this->modid = $modid;
+ }
+
+ public function getModname()
+ {
+ return $this->modname;
+ }
+
+ public function setModname($modname)
+ {
+ $this->modname = $modname;
+ }
+
+ public function getMinversion()
+ {
+ return $this->minversion;
+ }
+
+ public function setMinversion($minversion)
+ {
+ $this->minversion = $minversion;
+ }
+
+ public function getMaxversion()
+ {
+ return $this->maxversion;
+ }
+
+ public function setMaxversion($maxversion)
+ {
+ $this->maxversion = $maxversion;
+ }
+
+ public function getStatus()
+ {
+ return $this->status;
+ }
+
+ public function setStatus($status)
+ {
+ $this->status = $status;
+ }
+
+
+}
View
2  src/lib/Zikula/Framework/ModuleDispatcher.php
@@ -128,7 +128,7 @@ public function dispatch(Request $request)
// there is no break here deliberately.
case ($return === false):
$session = \ServiceUtil::getService('session');
- if (!$session->hasFlashes(\Zikula_Session::MESSAGE_ERROR)) {
+ if (!$session->getFlashBag()->has(\Zikula_Session::MESSAGE_ERROR)) {
\LogUtil::registerError(__f('Could not load the \'%1$s\' module at \'%2$s\'.', array($module, $func)), $httpCode, null);
}
$return = \ModUtil::func('Errors', 'user', 'main', array('message' => $message, 'exception' => $e));
View
2  src/system/Errors/Controller/UserController.php
@@ -43,7 +43,7 @@ public function mainAction($args)
->assign('reportlevel', System::getVar('reportlevel'))
->assign('funtext', System::getVar('funtext'));
- $messages = $session->popFlashes(Zikula_Session::MESSAGE_ERROR);
+ $messages = $session->getFlashBag()->get(Zikula_Session::MESSAGE_ERROR);
// show the detailed error message for admins only
if (System::isDevelopmentMode() || SecurityUtil::checkPermission('::', '::', ACCESS_ADMIN)) {
$message ? $messages[] = $message : null;
View
4 src/system/Extensions/Api/AdminApi.php
@@ -543,6 +543,8 @@ public function regenerate($args)
return LogUtil::registerArgsError();
}
+ $entity = 'Zikula\Core\Doctrine\Entity\Extension';
+
// default action
$filemodules = $args['filemodules'];
$defaults = (isset($args['defaults']) ? $args['defaults'] : false);
@@ -576,7 +578,7 @@ public function regenerate($args)
if (isset($dbmodinfo['name']) && in_array($dbmodinfo['name'], (array)$modinfo['oldnames'])) {
// migrate its modvars
$dql = "
- UPDATE Zikula\Core\DoctrineEntity\\ExtensionVar v
+ UPDATE Zikula\Core\DoctrineEntity\ExtensionVar v
SET v.modname = '{$modinfo['name']}'
WHERE v.modname = '{$dbname}'";
$query = $this->entityManager->createQuery($dql);
Please sign in to comment.
Something went wrong with that request. Please try again.