Fixed more template errors in order to get everything running with PHP 8.0.
Also: Fixed some tiny PHP errors. Thanks for reporting, Matthias!
This commit is contained in:
		
							parent
							
								
									3ce4a44864
								
							
						
					
					
						commit
						7e8ddb88b8
					
				@ -109,7 +109,9 @@ class admin_maintain_updates extends AdminPanelAction {
 | 
				
			|||||||
			$success = -1;
 | 
								$success = -1;
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$this->smarty->assign('updates', $ver);
 | 
							$this->smarty->assign('stableversion', $ver ['stable']);
 | 
				
			||||||
 | 
							$this->smarty->assign('unstableversion', $ver ['unstable']);
 | 
				
			||||||
 | 
							$this->smarty->assign('notice', $ver ['notice']);
 | 
				
			||||||
		$this->smarty->assign('fpweb', $this->fpweb);
 | 
							$this->smarty->assign('fpweb', $this->fpweb);
 | 
				
			||||||
		$this->smarty->assign('sfweb', $this->sfweb);
 | 
							$this->smarty->assign('sfweb', $this->sfweb);
 | 
				
			||||||
		$this->smarty->assign('success', $success);
 | 
							$this->smarty->assign('success', $success);
 | 
				
			||||||
 | 
				
			|||||||
@ -1,7 +1,7 @@
 | 
				
			|||||||
<h2>{$panelstrings.head}</h2>
 | 
					<h2>{$panelstrings.head}</h2>
 | 
				
			||||||
{include file=shared:errorlist.tpl}
 | 
					{include file=shared:errorlist.tpl}
 | 
				
			||||||
{$panelstrings.list|sprintf:$smarty.const.SYSTEM_VER:$sfweb:$updates.stable:$fpweb:$updates.unstable}
 | 
					{$panelstrings.list|sprintf:$smarty.const.SYSTEM_VER:$sfweb:$stableversion:$fpweb:$unstableversion}
 | 
				
			||||||
{if $updates.notice}
 | 
					{if $notice}
 | 
				
			||||||
<h5>{$panelstrings.notice}</h5>
 | 
					<h5>{$panelstrings.notice}</h5>
 | 
				
			||||||
<p>{$updates.notice}</p>
 | 
					<p>{$notice}</p>
 | 
				
			||||||
{/if}
 | 
					{/if}
 | 
				
			||||||
@ -1,11 +1,17 @@
 | 
				
			|||||||
<?php
 | 
					<?php
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class LayoutDefault {
 | 
					class LayoutDefault {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var $content;
 | 
						var $content;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var $fpdb;
 | 
						var $fpdb;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var $fp_widgets;
 | 
						var $fp_widgets;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var $smarty;
 | 
						var $smarty;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var $config;
 | 
						var $config;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var $lang;
 | 
						var $lang;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	var $tpl = 'index.tpl';
 | 
						var $tpl = 'index.tpl';
 | 
				
			||||||
@ -13,13 +19,12 @@
 | 
				
			|||||||
	var $message_queue = array();
 | 
						var $message_queue = array();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	function LayoutDefault($content = array()) {
 | 
						function LayoutDefault($content = array()) {
 | 
				
			||||||
			
 | 
					 | 
				
			||||||
		$this->pagecontent = $content;
 | 
							$this->pagecontent = $content;
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
			$this->fpdb =& new FPDB;
 | 
								$this->fpdb =& new FPDB();
 | 
				
			||||||
		$GLOBALS ['fpdb'] = & $this->fpdb;
 | 
							$GLOBALS ['fpdb'] = & $this->fpdb;
 | 
				
			||||||
					        
 | 
										        
 | 
				
			||||||
			$this->fp_widgets =& new widget_indexer;	
 | 
								$this->fp_widgets =& new widget_indexer();
 | 
				
			||||||
		$GLOBALS ['fp_widgets'] = & $this->fp_widgets;
 | 
							$GLOBALS ['fp_widgets'] = & $this->fp_widgets;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$this->smarty = & $GLOBALS ['_FP_SMARTY'];
 | 
							$this->smarty = & $GLOBALS ['_FP_SMARTY'];
 | 
				
			||||||
@ -27,7 +32,6 @@
 | 
				
			|||||||
		$GLOBALS ['fp_config'] = & $this->config;
 | 
							$GLOBALS ['fp_config'] = & $this->config;
 | 
				
			||||||
		$this->config = $GLOBALS ['fp_config'] ['general'];
 | 
							$this->config = $GLOBALS ['fp_config'] ['general'];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			
 | 
					 | 
				
			||||||
		$this->theme = theme_loadsettings();
 | 
							$this->theme = theme_loadsettings();
 | 
				
			||||||
		$GLOBALS ['theme'] = & $this->theme;
 | 
							$GLOBALS ['theme'] = & $this->theme;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -44,13 +48,9 @@
 | 
				
			|||||||
		$this->smarty->cache_dir = SMARTY_DIR . 'cache/';
 | 
							$this->smarty->cache_dir = SMARTY_DIR . 'cache/';
 | 
				
			||||||
		$this->smarty->caching = 0;
 | 
							$this->smarty->caching = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	
 | 
					 | 
				
			||||||
			
 | 
					 | 
				
			||||||
		do_action('init');
 | 
							do_action('init');
 | 
				
			||||||
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		
 | 
					 | 
				
			||||||
	function display() {
 | 
						function display() {
 | 
				
			||||||
		$this->main();
 | 
							$this->main();
 | 
				
			||||||
		theme_init($this->smarty, $this);
 | 
							theme_init($this->smarty, $this);
 | 
				
			||||||
@ -59,36 +59,35 @@
 | 
				
			|||||||
		unset($this->smarty);
 | 
							unset($this->smarty);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		do_action('shutdown');
 | 
							do_action('shutdown');
 | 
				
			||||||
			
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/*
 | 
						/*
 | 
				
			||||||
		
 | 
						 *
 | 
				
			||||||
		function post_message($module, $ring, $message) {
 | 
						 * function post_message($module, $ring, $message) {
 | 
				
			||||||
			$this->message_queue[$module][$ring][]=$message;
 | 
						 * $this->message_queue[$module][$ring][]=$message;
 | 
				
			||||||
			
 | 
						 *
 | 
				
			||||||
		}
 | 
						 * }
 | 
				
			||||||
		
 | 
						 *
 | 
				
			||||||
		function flush_messages($module, $ring=-1) {
 | 
						 * function flush_messages($module, $ring=-1) {
 | 
				
			||||||
		
 | 
						 *
 | 
				
			||||||
			$msg_arr=array();
 | 
						 * $msg_arr=array();
 | 
				
			||||||
			if ($ring<0)
 | 
						 * if ($ring<0)
 | 
				
			||||||
				$ring_arr =
 | 
						 * $ring_arr =
 | 
				
			||||||
					array_keys($this->message_queue[$module]);
 | 
						 * array_keys($this->message_queue[$module]);
 | 
				
			||||||
			else
 | 
						 * else
 | 
				
			||||||
				$ring_arr = array($ring);
 | 
						 * $ring_arr = array($ring);
 | 
				
			||||||
			
 | 
						 *
 | 
				
			||||||
			foreach($ring_arr as $this_ring) {
 | 
						 * foreach($ring_arr as $this_ring) {
 | 
				
			||||||
				$localq=& $this->message_queue[$module][$this_ring];
 | 
						 * $localq=& $this->message_queue[$module][$this_ring];
 | 
				
			||||||
				foreach ($localq as $msg) {
 | 
						 * foreach ($localq as $msg) {
 | 
				
			||||||
					$msg_arr[]=$msg;
 | 
						 * $msg_arr[]=$msg;
 | 
				
			||||||
				}			
 | 
						 * }
 | 
				
			||||||
			}
 | 
						 * }
 | 
				
			||||||
			
 | 
						 *
 | 
				
			||||||
			$this->smarty->append('err', $msg_arr);
 | 
						 * $this->smarty->append('err', $msg_arr);
 | 
				
			||||||
			return $msg_arr;
 | 
						 * return $msg_arr;
 | 
				
			||||||
		}
 | 
						 * }
 | 
				
			||||||
	 */
 | 
						 */
 | 
				
			||||||
		
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Abstract_LayoutIndex extends LayoutDefault {
 | 
					class Abstract_LayoutIndex extends LayoutDefault {
 | 
				
			||||||
@ -113,25 +112,29 @@
 | 
				
			|||||||
			'content' => $content
 | 
								'content' => $content
 | 
				
			||||||
		);
 | 
							);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
			if ($rawcontent) $this->smarty->assign('rawcontent', true);
 | 
							if ($rawcontent) {
 | 
				
			||||||
			
 | 
								$this->smarty->assign('rawcontent', true);
 | 
				
			||||||
 | 
							} else {
 | 
				
			||||||
 | 
								$this->smarty->assign('rawcontent', false);
 | 
				
			||||||
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	function pagecontent($params, $content, &$smarty, &$repeat) {
 | 
						function pagecontent($params, $content, &$smarty, &$repeat) {
 | 
				
			||||||
		if ($this->pagecontent) {
 | 
							if ($this->pagecontent) {
 | 
				
			||||||
			$this->smarty->assign($this->pagecontent);
 | 
								$this->smarty->assign($this->pagecontent);
 | 
				
			||||||
			return $content;
 | 
								return $content;
 | 
				
			||||||
			} else return;
 | 
							} else
 | 
				
			||||||
			
 | 
								return;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	function display() {
 | 
						function display() {
 | 
				
			||||||
			$this->smarty->register_block('page', array(&$this, 'pagecontent'));
 | 
							$this->smarty->register_block('page', array(
 | 
				
			||||||
 | 
								&$this,
 | 
				
			||||||
 | 
								'pagecontent'
 | 
				
			||||||
 | 
							));
 | 
				
			||||||
		parent::display();
 | 
							parent::display();
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
?>
 | 
					?>
 | 
				
			||||||
 | 
				
			|||||||
@ -5,7 +5,7 @@
 | 
				
			|||||||
	<subtitle>{$flatpress.subtitle}</subtitle>
 | 
						<subtitle>{$flatpress.subtitle}</subtitle>
 | 
				
			||||||
	<link href="{$smarty.const.BLOG_BASEURL}" />
 | 
						<link href="{$smarty.const.BLOG_BASEURL}" />
 | 
				
			||||||
	<link rel="self" href="{$smarty.server.REQUEST_URI|escape}" />
 | 
						<link rel="self" href="{$smarty.server.REQUEST_URI|escape}" />
 | 
				
			||||||
	<generator uri="http://www.flatpress.org/" version="{$flatpress.version}">
 | 
						<generator uri="http://www.flatpress.org/" version="{$smarty.const.SYSTEM_VER}">
 | 
				
			||||||
  		FlatPress
 | 
					  		FlatPress
 | 
				
			||||||
	</generator>
 | 
						</generator>
 | 
				
			||||||
	<rights> {$flatpress.author} {$smarty.now|date_format:'%Y'} </rights>
 | 
						<rights> {$flatpress.author} {$smarty.now|date_format:'%Y'} </rights>
 | 
				
			||||||
 | 
				
			|||||||
@ -8,7 +8,7 @@
 | 
				
			|||||||
		<title>{$flatpress.title} » {$subject}</title>
 | 
							<title>{$flatpress.title} » {$subject}</title>
 | 
				
			||||||
		<link>{$the_comment_link}</link>
 | 
							<link>{$the_comment_link}</link>
 | 
				
			||||||
		<description><![CDATA[{$flatpress.subtitle}]]></description>
 | 
							<description><![CDATA[{$flatpress.subtitle}]]></description>
 | 
				
			||||||
		<copyright>Copyright {$smarty.now|date_format:"$Y"}, {$flatpress.author}</copyright>
 | 
							<copyright>Copyright {'Y'|date}, {$flatpress.author}</copyright>
 | 
				
			||||||
 		{*<managingEditor>{$flatpress.email} ({$flatpress.author})</managingEditor>*}
 | 
					 		{*<managingEditor>{$flatpress.email} ({$flatpress.author})</managingEditor>*}
 | 
				
			||||||
		<language>{$fp_config.locale.lang}</language>
 | 
							<language>{$fp_config.locale.lang}</language>
 | 
				
			||||||
		<atom:link rel="self" href="{'rss2'|theme_comments_feed_link:$id}" type="application/rss+xml" />
 | 
							<atom:link rel="self" href="{'rss2'|theme_comments_feed_link:$id}" type="application/rss+xml" />
 | 
				
			||||||
 | 
				
			|||||||
@ -71,7 +71,7 @@ class Plugin_PrettyURLs {
 | 
				
			|||||||
	function permalink($str, $id) {
 | 
						function permalink($str, $id) {
 | 
				
			||||||
		global $fpdb, $post;
 | 
							global $fpdb, $post;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (PRETTYURLS_TITLES)
 | 
							if (isset($post) && PRETTYURLS_TITLES)
 | 
				
			||||||
			$title = sanitize_title($post ['subject']);
 | 
								$title = sanitize_title($post ['subject']);
 | 
				
			||||||
		else
 | 
							else
 | 
				
			||||||
			$title = $id;
 | 
								$title = $id;
 | 
				
			||||||
@ -499,7 +499,7 @@ class Plugin_PrettyURLs {
 | 
				
			|||||||
		if (isset($this->fp_params ['paged']) && $this->fp_params ['paged'] > 1)
 | 
							if (isset($this->fp_params ['paged']) && $this->fp_params ['paged'] > 1)
 | 
				
			||||||
			$page = $this->fp_params ['paged'];
 | 
								$page = $this->fp_params ['paged'];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		$page += $v;
 | 
							$page += ($v . '');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if ($page > 0) {
 | 
							if ($page > 0) {
 | 
				
			||||||
			$l .= 'page/' . $page . '/';
 | 
								$l .= 'page/' . $page . '/';
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user