diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/facebookaction.php | 5 | ||||
| -rw-r--r-- | lib/imagefile.php | 10 | ||||
| -rw-r--r-- | lib/tagcloudsection.php | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/lib/facebookaction.php b/lib/facebookaction.php index 528b58154..a20e618d3 100644 --- a/lib/facebookaction.php +++ b/lib/facebookaction.php @@ -73,9 +73,7 @@ class FacebookAction extends Action function prepare($argarray) { parent::prepare($argarray); - - common_debug("Facebookaction::prepare"); - + $this->facebook = getFacebook(); $this->fbuid = $this->facebook->require_login(); @@ -261,7 +259,6 @@ class FacebookAction extends Action function showInstructions() { - global $xw; $this->elementStart('dl', array('class' => 'system_notice')); $this->element('dt', null, 'Page Notice'); diff --git a/lib/imagefile.php b/lib/imagefile.php index f15a72c76..7f1db892c 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -48,12 +48,17 @@ if (!defined('LACONICA')) { class ImageFile { var $filename = null; + var $barename = null; var $type = null; + var $height = null; + var $width = null; - function __construct($filename=null, $type=null) + function __construct($filename=null, $type=null, $width=null, $height=null) { $this->filename = $filename; $this->type = $type; + $this->width = $type; + $this->height = $type; } static function fromUpload($param='upload') @@ -83,6 +88,9 @@ class ImageFile return; } + $imagefile->width = $info[0]; + $imagefile->height = $info[1]; + switch ($info[2]) { case IMAGETYPE_GIF: case IMAGETYPE_JPEG: diff --git a/lib/tagcloudsection.php b/lib/tagcloudsection.php index 178dd88ca..ff2aca6d6 100644 --- a/lib/tagcloudsection.php +++ b/lib/tagcloudsection.php @@ -76,7 +76,7 @@ class TagCloudSection extends Section $this->out->elementStart('ul', 'tags xoxo tag-cloud'); foreach ($tw as $tag => $weight) { - $this->showTag($tag, $weight, $weight/$sum); + $this->showTag($tag, $weight, ($sum == 0) ? 0 : $weight/$sum); } $this->out->elementEnd('ul'); |