diff options
| author | Greg Roach <fisharebest@gmail.com> | 2013-12-03 22:58:46 +0000 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2013-12-05 18:02:57 +0000 |
| commit | 8abaf83024d0edb6f6bab8dd0ee55130c4db2073 (patch) | |
| tree | e9d1cf1e38b90fe1d08dc9fcc77bddd45b09ae76 /library/WT/Controller | |
| parent | 3ed5b6b293ed57273d9ce8b3e26191cb4d167ee0 (diff) | |
| download | webtrees-8abaf83024d0edb6f6bab8dd0ee55130c4db2073.tar.gz webtrees-8abaf83024d0edb6f6bab8dd0ee55130c4db2073.tar.bz2 webtrees-8abaf83024d0edb6f6bab8dd0ee55130c4db2073.zip | |
Create version string using semantic versioning: 1.5.2-dev comes before 1.5.2
Diffstat (limited to 'library/WT/Controller')
| -rw-r--r-- | library/WT/Controller/Page.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/library/WT/Controller/Page.php b/library/WT/Controller/Page.php index 53d0f6e54d..ec28cd3dad 100644 --- a/library/WT/Controller/Page.php +++ b/library/WT/Controller/Page.php @@ -133,21 +133,21 @@ class WT_Controller_Page extends WT_Controller_Base { $title=html_entity_decode(strip_tags($this->page_title), ENT_QUOTES, 'UTF-8'); // Initialise variables for the theme’s header.php - $LINK_CANONICAL =$this->canonical_url; - $META_ROBOTS =$this->meta_robots; - $META_DESCRIPTION=WT_GED_ID ? get_gedcom_setting(WT_GED_ID, 'META_DESCRIPTION') : ''; + $LINK_CANONICAL = $this->canonical_url; + $META_ROBOTS = $this->meta_robots; + $META_DESCRIPTION = WT_GED_ID ? get_gedcom_setting(WT_GED_ID, 'META_DESCRIPTION') : ''; if (!$META_DESCRIPTION) { - $META_DESCRIPTION=WT_TREE_TITLE; + $META_DESCRIPTION = WT_TREE_TITLE; } - $META_GENERATOR =WT_WEBTREES.'-'.WT_VERSION_TEXT.' - '.WT_WEBTREES_URL; - $META_TITLE =WT_GED_ID ? get_gedcom_setting(WT_GED_ID, 'META_TITLE') : ''; + $META_GENERATOR = WT_WEBTREES . ' ' . WT_VERSION . ' - ' . WT_WEBTREES_URL; + $META_TITLE = WT_GED_ID ? get_gedcom_setting(WT_GED_ID, 'META_TITLE') : ''; if ($META_TITLE) { - $title.=' - '.$META_TITLE; + $title .= ' - ' . $META_TITLE; } // This javascript needs to be loaded in the header, *before* the CSS. // All other javascript should be defered until the end of the page - $javascript= '<script src="' . WT_MODERNIZR_URL . '"></script>'; + $javascript = '<script src="' . WT_MODERNIZR_URL . '"></script>'; // Give Javascript access to some PHP constants $this->addInlineJavascript(' |