* (bug 2769) Use '-' form for language consistently on command-line

* Fixlets to rebuildImages.php: clear memcached, indicate missing

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f436287..ced38e9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -558,6 +558,8 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * (bug 2761) fix capitalization of "i" in Turkish
 * (bug 2789) memcached image metadata now cleared after deletion
 * Add serialized version number to image metadata cache records
+* (bug 2769) Use '-' form for language consistently on command-line
+* Fixlets to rebuildImages.php: clear memcached, indicate missing
 
 
 === Caveats ===

diff --git a/includes/SiteConfiguration.php b/includes/SiteConfiguration.php
index e3befe7..6aa7d45 100644 (file)
--- a/includes/SiteConfiguration.php
+++ b/includes/SiteConfiguration.php
@@ -94,6 +94,7 @@ class SiteConfiguration {
                                break;
                        }
                }
+               $lang = str_replace( '_', '-', $lang );
                return array( $site, $lang );
        }
 

diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index e3115dc..d14f77b 100644 (file)
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -124,6 +124,11 @@ class ImageBuilder extends FiveUpgrade {
                
                // Fill in the new image info fields
                $info = $this->imageInfo( $row->img_name );
+
+               global $wgMemc, $wgDBname;
+               $key = $wgDBname . ":Image:" . md5( $row->img_name );
+               $wgMemc->delete( $key );
+
                return array(
                        'img_width'      => $info['width'],
                        'img_height'     => $info['height'],
@@ -234,6 +239,11 @@ class ImageBuilder extends FiveUpgrade {
                        }
                }
                
+               if( $filename == '' ) {
+                       $this->log( "Empty filename for $fullpath" );
+                       return;
+               }
+               
                $fields = array(
                        'img_name'       => $filename,
                        'img_size'       => $size,