Merge branch '2017.12' into 2018.09

André R · André R · commit e50d17cfc4fc · 2019-05-03T14:15:28.000+02:00
diff --git a/design/admin/images/3/logo_separator_sprite.png b/design/admin/images/3/logo_separator_sprite.png
diff --git a/design/admin/stylesheets/pagelayout.css b/design/admin/stylesheets/pagelayout.css
@@ -130,7 +130,7 @@ a.image-text:hover > span
     text-decoration: none;
     color:#f4f4f4;
     font-size:11px;
-    background: transparent url('../images/3/logo_separator_sprite.png') -117px 11px no-repeat;
+    background: transparent url('../images/3/logo_separator_sprite.png') -117px 16px no-repeat;
     padding-left:11px;
     padding-right:11px;
 }
diff --git a/design/admin/templates/dashboard/maintenance.tpl b/design/admin/templates/dashboard/maintenance.tpl
@@ -2,6 +2,6 @@
 <div id="mainteinance-text">
     <h2>{'Software update and Maintenance'|i18n( 'design/admin/dashboard/maintenance' )}</h2>
 
-    <p>{'Your installation: <span id="ez-version">%1</span>'|i18n( 'design/admin/dashboard/maintenance', , array( fetch( 'setup', 'version' ) ) )}</p>
+    <p>{'Your installation: <span id="ez-version">%1</span>'|i18n( 'design/admin/dashboard/maintenance', , array( fetch( 'setup', 'alias' ) ) )}</p>
     <p>{'You are running <span class="edition-info">%edition</span>, it might not be up to date with the latest hot fixes and service packs. Contact <a href="%ez_link">eZ Systems</a> for more infomation.'|i18n( 'design/admin/dashboard/maintenance', , hash( '%edition', fetch( 'setup', 'edition' ), '%ez_link', "http://ez.no" ) )}</p>
 </div>
diff --git a/kernel/setup/ezsetupfunctioncollection.php b/kernel/setup/ezsetupfunctioncollection.php
@@ -21,6 +21,11 @@ function fetchFullVersionString()
         return array( 'result' => eZPublishSDK::version() );
     }
 
+    function fetchVersionAlias()
+    {
+        return array( 'result' => eZPublishSDK::version( false, true ) );
+    }
+
     function fetchMajorVersion()
     {
         return array( 'result' => eZPublishSDK::majorVersion() );
diff --git a/kernel/setup/function_definition.php b/kernel/setup/function_definition.php
@@ -14,6 +14,12 @@
                                                           'method' => 'fetchFullVersionString' ),
                                   'parameter_type' => 'standard',
                                   'parameters' => array( ) );
+$FunctionList['alias'] = array( 'name' => 'alias',
+                                'operation_types' => array( 'read' ),
+                                'call_method' => array( 'class' => 'eZSetupFunctionCollection',
+                                                        'method' => 'fetchVersionAlias' ),
+                                'parameter_type' => 'standard',
+                                'parameters' => array( ) );
 $FunctionList['major_version'] = array( 'name' => 'major_version',
                                         'operation_types' => array( 'read' ),
                                         'call_method' => array( 'class' => 'eZSetupFunctionCollection',
diff --git a/lib/version.php b/lib/version.php
@@ -32,7 +32,7 @@ static function version( $withRelease = true, $asAlias = false, $withState = tru
         if ( $asAlias )
         {
             $versionText = eZPublishSDK::alias();
-            if ( $withState )
+            if ( $withState && eZPublishSDK::state() )
                 $versionText .= "-" . eZPublishSDK::state();
         }
         else
@@ -94,7 +94,7 @@ static function release()
     */
     static function alias()
     {
-        return eZPublishSDK::version();
+        return eZPublishSDK::VERSION_ALIAS;
     }
 
     /*!

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ a.image-text:hover > span`
`130`	`130`	`text-decoration: none;`
`131`	`131`	`color:#f4f4f4;`
`132`	`132`	`font-size:11px;`
`133`		`- background: transparent url('../images/3/logo_separator_sprite.png') -117px 11px no-repeat;`
	`133`	`+ background: transparent url('../images/3/logo_separator_sprite.png') -117px 16px no-repeat;`
`134`	`134`	`padding-left:11px;`
`135`	`135`	`padding-right:11px;`
`136`	`136`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,11 @@ function fetchFullVersionString()`
`21`	`21`	`return array( 'result' => eZPublishSDK::version() );`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ function fetchVersionAlias()`
	`25`	`+ {`
	`26`	`+ return array( 'result' => eZPublishSDK::version( false, true ) );`
	`27`	`+ }`
	`28`	`+`
`24`	`29`	`function fetchMajorVersion()`
`25`	`30`	`{`
`26`	`31`	`return array( 'result' => eZPublishSDK::majorVersion() );`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ static function version( $withRelease = true, $asAlias = false, $withState = tru`
`32`	`32`	`if ( $asAlias )`
`33`	`33`	`{`
`34`	`34`	`$versionText = eZPublishSDK::alias();`
`35`		`- if ( $withState )`
	`35`	`+ if ( $withState && eZPublishSDK::state() )`
`36`	`36`	`$versionText .= "-" . eZPublishSDK::state();`
`37`	`37`	`}`
`38`	`38`	`else`
`@@ -94,7 +94,7 @@ static function release()`
`94`	`94`	`*/`
`95`	`95`	`static function alias()`
`96`	`96`	`{`
`97`		`- return eZPublishSDK::version();`
	`97`	`+ return eZPublishSDK::VERSION_ALIAS;`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`/*!`