wip #3702 @0.25

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9b95f681ebfd6eb75db5f9e4ec88de761251647e..0f89401685eb3e2f95fcf00ff8efdd439e4ed4ed 100644 (file)
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,13 +4,10 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7257 @3">
+    <list default="true" id="530ffb50-16c9-4bb3-ad22-e76f531eb78c" name="Default" comment="wip #7257 @2">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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$/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" />
+      <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/View/Helper/LinkInternal.php" beforeDir="false" afterPath="$PROJECT_DIR$/framework/library/CubeIT/View/Helper/LinkInternal.php" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -843,7 +840,8 @@
       <workItem from="1739209041347" duration="1137000" />
       <workItem from="1739539005844" duration="4288000" />
       <workItem from="1739788502594" duration="628000" />
-      <workItem from="1739800972227" duration="8566000" />
+      <workItem from="1739800972227" duration="9576000" />
+      <workItem from="1739875492260" duration="160000" />
     </task>
     <task id="LOCAL-00117" summary="fix #1407 @1">
       <created>1494411210038</created>
@@ -1188,7 +1186,7 @@
       <option name="project" value="LOCAL" />
       <updated>1682409989659</updated>
     </task>
-    <option name="localTasksCounter" value="176" />
+    <option name="localTasksCounter" value="177" />
     <servers>
       <Redmine shared="true" url="https://team.cubedesigners.com/redmine">
         <option name="APIKey" value="ee454486fcd47aa38e5c99d5a7dc44cff1f65597" />
@@ -1220,7 +1218,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="wait #3693 @2" />
     <MESSAGE value="fix #3701 @0:05" />
     <MESSAGE value="wip #3703 @0.75" />
     <MESSAGE value="wip #3726 @0.5" />
@@ -1245,7 +1242,8 @@
     <MESSAGE value="wait #7244 @1" />
     <MESSAGE value="wip #7257 @0.75" />
     <MESSAGE value="wip #7257 @3" />
-    <option name="LAST_COMMIT_MESSAGE" value="wip #7257 @3" />
+    <MESSAGE value="wip #7257 @2" />
+    <option name="LAST_COMMIT_MESSAGE" value="wip #7257 @2" />
     <option name="NON_MODAL_COMMIT_POSTPONE_SLOW_CHECKS" value="false" />
   </component>
   <component name="XDebuggerManager">

diff --git a/framework/application/configs/application.ini b/framework/application/configs/application.ini
index ced1009063a4c8edee820244233953785f1e72ce..e1e02811cc5a9790eaf44cc7dba4b0980b164c57 100644 (file)
--- a/framework/application/configs/application.ini
+++ b/framework/application/configs/application.ini
@@ -57,7 +57,7 @@ privacy.analytics = 1
 
 [learning : production]
 
-dev=true
+dev=false
 
 seo.robots = false
 
@@ -70,10 +70,7 @@ database.params.dbname = fluidbook-v3-elearning
 
 [testing : production]
 
-dev = true
-firephp = false
-
-;minify.js = false
+dev = false
 
 seo.universalAnalytics = UA-4339912-9
 

diff --git a/framework/library/CubeIT/View/Helper/LinkInternal.php b/framework/library/CubeIT/View/Helper/LinkInternal.php
index 3f1464ec6a6a5af3d429b09ff9076d736f9d5930..20fd67dbf33d55a68456d85f0079042fed7f5f22 100644 (file)
--- a/framework/library/CubeIT/View/Helper/LinkInternal.php
+++ b/framework/library/CubeIT/View/Helper/LinkInternal.php
@@ -27,7 +27,12 @@ class CubeIT_View_Helper_LinkInternal extends CubeIT_View_Helper_Link {
                if ($sid) {
                        $url .= '?sid=' . Zend_Session::getId();
                }
-               return $this->link($content, $url, array_merge($internal['attributes'], $attributes));
+
+        if($internal['attributes']) {
+            $attributes=array_merge($internal['attributes'], $attributes);
+        }
+
+               return $this->link($content, $url, $attributes);
        }
 
 }