wip #7257 @2

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f0eb2ccb69d7025e05f3e6e5e5a038d41edb1acd..9b95f681ebfd6eb75db5f9e4ec88de761251647e 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,14 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7264 @2">
-      <change beforePath="$PROJECT_DIR$/.docker/production/docker-compose.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/production/docker-compose.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.docker/production/update" beforeDir="false" afterPath="$PROJECT_DIR$/.docker/production/update" afterDir="false" />
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7257 @3">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/application/Bootstrap.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/Bootstrap.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/framework/application/configs/application.ini" beforeDir="false" afterPath="$PROJECT_DIR$/framework/application/configs/application.ini" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Application.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Application.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Bootstrap/Navigation.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/less/104-nav.less" beforeDir="false" afterPath="$PROJECT_DIR$/less/104-nav.less" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Db/Select/Cache.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Db/Select/Cache.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Form/CMSBase.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Form/CMSBase.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/framework/library/CubeIT/Navigation/Page.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/Navigation/Page.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -844,7 +843,7 @@
       <workItem from="1739209041347" duration="1137000" />
       <workItem from="1739539005844" duration="4288000" />
       <workItem from="1739788502594" duration="628000" />
-      <workItem from="1739800972227" duration="5782000" />
+      <workItem from="1739800972227" duration="8566000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1189,7 +1188,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="175" />
+    <option name="localTasksCounter" value="176" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
@@ -1221,7 +1220,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="wait #3669 @0.5" />
     <MESSAGE value="wait #3693 @2" />
     <MESSAGE value="fix #3701 @0:05" />
     <MESSAGE value="wip #3703 @0.75" />
@@ -1246,7 +1244,8 @@
     <MESSAGE value="." />
     <MESSAGE value="wait #7244 @1" />
     <MESSAGE value="wip #7257 @0.75" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #7257 @0.75" />
+    <MESSAGE value="wip #7257 @3" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #7257 @3" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">

diff --git a/framework/library/CubeIT/Application.php b/framework/library/CubeIT/Application.php
index 2d99eaa7e786736a4b6c6565cad322dd70e2b4ec..3ae5e536be2766c10806cb4550ebc392891aa557 100644 (file)
--- a/framework/library/CubeIT/Application.php
+++ b/framework/library/CubeIT/Application.php
@@ -58,7 +58,7 @@ class CubeIT_Application extends Zend_Application
                 'soap.wsdl_cache_dir' => CACHE_PATH . '/' . APPLICATION_ENV . '/wsdl',
                 'soap.wsdl_cache_limit' => 20,
                 'opcache.validate_timestamps' => true,
-                'opcache.revalidate_freq' => 60,
+                'opcache.revalidate_freq' => 1,
                 'opcache.revalidate_path' => true,
             );
 

diff --git a/framework/library/CubeIT/Bootstrap/Navigation.php b/framework/library/CubeIT/Bootstrap/Navigation.php
index 57a4213ac60bc0c46db8c7b3c1e422ea9c71fa39..c7b74c5f31e6159a53271300f691ca8aa3b4abd8 100644 (file)
--- a/framework/library/CubeIT/Bootstrap/Navigation.php
+++ b/framework/library/CubeIT/Bootstrap/Navigation.php
@@ -15,18 +15,14 @@ class CubeIT_Bootstrap_Navigation extends CubeIT_Bootstrap_Locale
         if ($full) {
             $res .= '_full';
         }
-        $res = str_replace('-', '_', $res);
-        return $res;
+        return str_replace('-', '_', $res);
     }
 
     protected function _makeNavigation($refresh = false, $full = false)
     {
         profile(__FILE__, __LINE__, 'Make Application navigation');
 
-
         $isAdmin = $this->isAllowed('administration');
-        $cacheId = $this->_getNavigationCacheId($isAdmin, $full);
-
         $navigation = $this->_createNavigation($isAdmin);
 
         $r = $this->navRoot;

diff --git a/framework/library/CubeIT/Db/Select/Cache.php b/framework/library/CubeIT/Db/Select/Cache.php
index 8ba5b263cb5c2746a066e251194230b58a631886..161b1a0cb691ac838201b2d7fd317392e3785b46 100644 (file)
--- a/framework/library/CubeIT/Db/Select/Cache.php
+++ b/framework/library/CubeIT/Db/Select/Cache.php
@@ -22,13 +22,9 @@ class CubeIT_Db_Select_Cache extends CubeIT_Db_Select {
        }
 
        protected function _fetch($fetchFunc = 'fetchAll', $cacheTags = array(), $cacheSpecificLifetime = false, $fetchMode = null, $bind = array()) {
-               $id = sha1($this->assemble() . $fetchMode . json_encode($bind) . $fetchFunc);
 
-               if (($res = $this->_cache->load($id)) === false) {
-                       $res = $this->query($fetchMode, $bind)->$fetchFunc();
-                       $this->_cache->save($res, $id, $cacheTags, $cacheSpecificLifetime);
-               }
-               return $res;
+               return $this->query($fetchMode, $bind)->$fetchFunc();
+
        }
 
 }

diff --git a/framework/library/CubeIT/Form/CMSBase.php b/framework/library/CubeIT/Form/CMSBase.php
index c98314a0185e8d947cec1c733edc2590942a3dba..f5437bd2077a9c6e77c18905b3d3001b22da1cc2 100644 (file)
--- a/framework/library/CubeIT/Form/CMSBase.php
+++ b/framework/library/CubeIT/Form/CMSBase.php
@@ -24,8 +24,7 @@ class CubeIT_Form_CMSBase extends CubeIT_Form {
         $this->getElement('formTimestamp')->setValue(microtime());
         $this->getElement('consistencyCheck')->setValue(self::CONSISTENCY_CHECK_VALUE);
 
-        $res = parent::render($view);
-        return $res;
+        return parent::render($view);
     }
 
 
@@ -42,7 +41,6 @@ class CubeIT_Form_CMSBase extends CubeIT_Form {
 
         // Check for static known value to make sure form data hasn't been lost
         if(isset($data['consistencyCheck']) && $data['consistencyCheck'] != self::CONSISTENCY_CHECK_VALUE) {
-            fb('Form consistency check failure - expected value not found.');
             return false;
         }
 

diff --git a/framework/library/CubeIT/Navigation/Page.php b/framework/library/CubeIT/Navigation/Page.php
index 7a9767dedd10740f82ee015c3b431b8021179b70..58c77f7f960544ad08b5bb8611eefdfe1a4a2201 100644 (file)
--- a/framework/library/CubeIT/Navigation/Page.php
+++ b/framework/library/CubeIT/Navigation/Page.php
@@ -479,10 +479,9 @@ class CubeIT_Navigation_Page extends Zend_Navigation_Page_Uri implements Zend_Ac
 
        public function getFinalUri() {
                if (in_array($this->getTemplate(), Bootstrap::getInstance()->_getNextRedirectionTemplates())) {
-                       fb($this->getTemplate());
                        $pages = $this->getPages();
                        foreach ($pages as $p) {
-                               return $p->getFinalUri();
+                               return $p->getUri();
                        }
                } else {
                        $root = $this->getParentAt(-1);